Initial conversion for TQT_THREAD_SUPPORT->!TQT_NO_THREAD

Signed-off-by: Alexander Golubev <fatzer2@gmail.com>

24 files changed, 41 insertions, 28 deletions

diff --git a/configure b/configure
index 1da0a59e..9320d83b 100755
--- a/configure
+++ b/configure
@@ -2580,6 +2580,8 @@ fi
 if [ "$CFG_THREAD" = "yes" ]; then
     QMAKE_OUTDIR="${QMAKE_OUTDIR}-mt"
     QMAKE_CONFIG="$QMAKE_CONFIG thread"
+else
+    QCONFIG_FLAGS="$QCONFIG_FLAGS TQT_NO_THREAD"
 fi
 if [ "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QNX" = "yes" ]; then
     QMAKE_OUTDIR="${QMAKE_OUTDIR}-emb-$CFG_EMBEDDED"
diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix
index 8e94d388..71e83614 100644
--- a/qmake/Makefile.unix
+++ b/qmake/Makefile.unix
@@ -36,7 +36,7 @@ CXXFLAGS= @QMAKE_CXXFLAGS@ \
 	-I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \
 	-I@BUILD_PATH@/include/qmake -I@BUILD_PATH@/include -I@SOURCE_PATH@/include \
 	-DTQT_NO_TEXTCODEC -DTQT_NO_UNICODETABLES -DTQT_NO_COMPONENT -DTQT_NO_STL \
-	-DTQT_NO_COMPRESS -I@QMAKESPEC@ -DHAVE_QCONFIG_CPP
+	-DTQT_NO_COMPRESS -DTQT_NO_THREAD -I@QMAKESPEC@ -DHAVE_QCONFIG_CPP
 LFLAGS=@QMAKE_LFLAGS@
 
 tqmake: $(OBJS) $(QOBJS)
diff --git a/qmake/Makefile.win32-g++ b/qmake/Makefile.win32-g++
index a25b8f35..a1ca675e 100644
--- a/qmake/Makefile.win32-g++
+++ b/qmake/Makefile.win32-g++
@@ -5,7 +5,7 @@ CXX	    =	g++
 CFLAGS	    =	-c -o$@ -O \
 		-I. -Igenerators -Igenerators\unix -Igenerators\win32 -Igenerators\mac -I..\include -I..\src\tools \
 		-I..\mkspecs\win32-g++ \
-		-DUNICODE -DTQT_NO_TEXTCODEC -DQT_LITE_COMPONENT -DQT_NODLL -DTQT_NO_STL -DTQT_NO_COMPRESS
+		-DUNICODE -DTQT_NO_TEXTCODEC -DQT_LITE_COMPONENT -DQT_NODLL -DTQT_NO_STL -DTQT_NO_COMPRESS -DTQT_NO_THREAD
 CXXFLAGS    =   $(CFLAGS)
 LFLAGS	    =	
 LIBS	    = -lole32 -luuid 
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
index a3532f97..c1dccc6d 100644
--- a/qmake/generators/unix/unixmake.cpp
+++ b/qmake/generators/unix/unixmake.cpp
@@ -228,8 +228,6 @@ UnixMakefileGenerator::init()
     if ( project->isActiveConfig("dylib") )
 	project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_DYNLOAD"];
     if ( project->isActiveConfig("thread") ) {
-	if(project->isActiveConfig("qt"))
-	    project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("TQT_THREAD_SUPPORT");
 	if ( !project->isEmpty("QMAKE_CFLAGS_THREAD")) {
 	    project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_THREAD"];
 	    project->variables()["PRL_EXPORT_CFLAGS"] += project->variables()["QMAKE_CFLAGS_THREAD"];
diff --git a/qmake/generators/win32/borland_bmake.cpp b/qmake/generators/win32/borland_bmake.cpp
index 9d8dc7cb..9d4d1e31 100644
--- a/qmake/generators/win32/borland_bmake.cpp
+++ b/qmake/generators/win32/borland_bmake.cpp
@@ -426,8 +426,6 @@ BorlandMakefileGenerator::init()
 	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_WARN_ON"];
     }
     if(project->isActiveConfig("qt")) {
-	if ( project->isActiveConfig("thread") )
-	    project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("TQT_THREAD_SUPPORT");
 	if ( project->isActiveConfig("accessibility" ) )
 	    project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_ACCESSIBILITY_SUPPORT");
 	if ( project->isActiveConfig("tablet") )
diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp
index 06952431..2de37e5e 100644
--- a/qmake/generators/win32/mingw_make.cpp
+++ b/qmake/generators/win32/mingw_make.cpp
@@ -428,11 +428,10 @@ MingwMakefileGenerator::init()
 		project->variables()["CONFIG"].append("dll");
 	}
 	if ( project->isActiveConfig("thread") ) {
-            project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("TQT_THREAD_SUPPORT");
-            project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_THREAD"];
-            project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_THREAD"];
-            project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_THREAD"];
-        }
+	    project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_THREAD"];
+	    project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_THREAD"];
+	    project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_THREAD"];
+	}
 	if ( project->isActiveConfig("accessibility" ) )
 	    project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_ACCESSIBILITY_SUPPORT");
 	if ( project->isActiveConfig("tablet") )
diff --git a/qmake/generators/win32/msvc_dsp.cpp b/qmake/generators/win32/msvc_dsp.cpp
index 6b6b8fdb..ee9d6c79 100644
--- a/qmake/generators/win32/msvc_dsp.cpp
+++ b/qmake/generators/win32/msvc_dsp.cpp
@@ -746,8 +746,6 @@ DspMakefileGenerator::init()
 	project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_OPENGL"];
     }
     if ( thread ) {
-	if(project->isActiveConfig("qt"))
-	    project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("TQT_THREAD_SUPPORT" );
         if ( project->isActiveConfig("dll") || project->first("TARGET") == "qtmain"
 	     || !project->variables()["QMAKE_QT_DLL"].isEmpty() ) {
 	    project->variables()["MSVCDSP_MTDEFD"] += project->variables()["QMAKE_CXXFLAGS_MT_DLLDBG"];
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp
index a1ada25f..b6287b8d 100644
--- a/qmake/generators/win32/msvc_nmake.cpp
+++ b/qmake/generators/win32/msvc_nmake.cpp
@@ -511,8 +511,6 @@ NmakeMakefileGenerator::init()
 	    if ( is_qt && !project->variables()["QMAKE_LIB_FLAG"].isEmpty() )
 		project->variables()["CONFIG"].append("dll");
 	}
-	if ( project->isActiveConfig("thread") )
-	    project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("TQT_THREAD_SUPPORT");
 	if ( project->isActiveConfig("accessibility" ) )
 	    project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_ACCESSIBILITY_SUPPORT");
 	if ( project->isActiveConfig("tablet") )
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index 999b05f0..ca81c749 100644
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -483,7 +483,6 @@ void VcprojGenerator::init()
 	}
 
 	if( project->isActiveConfig("thread") ) {
-	    project->variables()["DEFINES"] += "TQT_THREAD_SUPPORT";
 	    project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_THREAD"];
 	} else {
 	    project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT"];
@@ -1208,8 +1207,6 @@ void VcprojGenerator::initOld()
 
     // THREAD --------------------------------------------------------
     if ( project->isActiveConfig("thread") ) {
-	if(project->isActiveConfig("qt"))
-	    project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("TQT_THREAD_SUPPORT" );
 	if ( !project->variables()["DEFINES"].contains("QT_DLL") && is_qt
 	     && project->first("TARGET") != "qtmain" )
 	    project->variables()["QMAKE_LFLAGS"].append("/NODEFAULTLIB:libc");
diff --git a/src/kernel/ntqthread.h b/src/kernel/ntqthread.h
index 695a61fb..6f72e67c 100644
--- a/src/kernel/ntqthread.h
+++ b/src/kernel/ntqthread.h
@@ -41,12 +41,12 @@
 #ifndef TQTHREAD_H
 #define TQTHREAD_H
 
-#if defined(TQT_THREAD_SUPPORT)
-
 #ifndef QT_H
 #include "ntqwindowdefs.h"
 #endif // QT_H
 
+#if defined(TQT_THREAD_SUPPORT)
+
 #include <limits.h>
 
 class TQThreadInstance;
diff --git a/src/kernel/qthread.cpp b/src/kernel/qthread.cpp
index bb51e41f..185921c7 100644
--- a/src/kernel/qthread.cpp
+++ b/src/kernel/qthread.cpp
@@ -36,6 +36,8 @@
 **
 **********************************************************************/
 
+#include "ntqglobal.h"
+
 #ifdef TQT_THREAD_SUPPORT
 
 #include "qplatformdefs.h"
diff --git a/src/kernel/qthread_unix.cpp b/src/kernel/qthread_unix.cpp
index 7a6bc339..501471fe 100644
--- a/src/kernel/qthread_unix.cpp
+++ b/src/kernel/qthread_unix.cpp
@@ -36,6 +36,8 @@
 **
 **********************************************************************/
 
+#include "ntqglobal.h"
+
 #if defined(TQT_THREAD_SUPPORT)
 
 #include "qplatformdefs.h"
diff --git a/src/moc/moc.pro b/src/moc/moc.pro
index c8abcf0d..3e9cb1b5 100644
--- a/src/moc/moc.pro
+++ b/src/moc/moc.pro
@@ -3,7 +3,7 @@ TARGET		= tqmoc
 
 CONFIG 		= console release qtinc yacc lex_included yacc_no_name_mangle
 DEFINES	       += QT_MOC TQT_NO_CODECS QT_LITE_UNICODE TQT_NO_COMPONENT \
-		  TQT_NO_STL TQT_NO_COMPRESS
+		  TQT_NO_STL TQT_NO_COMPRESS TQT_NO_THREAD
 win32:DEFINES  += QT_NODLL
 DESTDIR         = ../../bin
 
diff --git a/src/qt.pro b/src/qt.pro
index 84482686..e9c00598 100644
--- a/src/qt.pro
+++ b/src/qt.pro
@@ -121,7 +121,8 @@ thread {
 	!win32-borland:TARGET = tqt-mt
 	win32-borland:TARGET = qtmt
 	embedded:TARGET = qte-mt
-	DEFINES += TQT_THREAD_SUPPORT
+} else {
+	DEFINES += TQT_NO_THREAD
 }
 
 !cups:DEFINES += TQT_NO_CUPS
diff --git a/src/tools/ntqglobal.h b/src/tools/ntqglobal.h
index f83da9d7..4805869a 100644
--- a/src/tools/ntqglobal.h
+++ b/src/tools/ntqglobal.h
@@ -822,6 +822,12 @@ class TQString;
 #include "ntqfeatures.h"
 #endif /* QT_H */
 
+// Keep the old flag for thread support in sync with the new one
+#ifndef TQT_NO_THREAD
+# define TQT_THREAD_SUPPORT
+#else
+# undef TQT_THREAD_SUPPORT
+#endif
 
 //
 // Create TQt DLL if QT_DLL is defined (Windows only)
diff --git a/src/tools/ntqthreadstorage.h b/src/tools/ntqthreadstorage.h
index 58862123..b9e0e11b 100644
--- a/src/tools/ntqthreadstorage.h
+++ b/src/tools/ntqthreadstorage.h
@@ -39,12 +39,12 @@
 #ifndef TQTHREADSTORAGE_H
 #define TQTHREADSTORAGE_H
 
-#ifdef TQT_THREAD_SUPPORT
-
 #ifndef QT_H
 #include "ntqglobal.h"
 #endif // QT_H
 
+#ifdef TQT_THREAD_SUPPORT
+
 class TQ_EXPORT TQThreadStorageData
 {
 public:
diff --git a/src/tools/qcriticalsection_p.cpp b/src/tools/qcriticalsection_p.cpp
index 20c2127b..53496095 100644
--- a/src/tools/qcriticalsection_p.cpp
+++ b/src/tools/qcriticalsection_p.cpp
@@ -36,6 +36,8 @@
 **
 **********************************************************************/
 
+#include "ntqglobal.h"
+
 #if defined(TQT_THREAD_SUPPORT)
 
 #include "qt_windows.h"
diff --git a/src/tools/qcriticalsection_p.h b/src/tools/qcriticalsection_p.h
index 330e141e..0c362bc7 100644
--- a/src/tools/qcriticalsection_p.h
+++ b/src/tools/qcriticalsection_p.h
@@ -54,6 +54,8 @@
 //
 //
 
+#include "ntqglobal.h"
+
 #if defined(TQT_THREAD_SUPPORT)
 
 #if defined(TQ_WS_WIN)
diff --git a/src/tools/qmutex_unix.cpp b/src/tools/qmutex_unix.cpp
index 597d3e62..3c568dbb 100644
--- a/src/tools/qmutex_unix.cpp
+++ b/src/tools/qmutex_unix.cpp
@@ -38,6 +38,8 @@
 **
 **********************************************************************/
 
+#include "ntqglobal.h"
+
 #if defined(TQT_THREAD_SUPPORT)
 
 #include "qplatformdefs.h"
diff --git a/src/tools/qmutexpool_p.h b/src/tools/qmutexpool_p.h
index a0bb2856..7f5ecabe 100644
--- a/src/tools/qmutexpool_p.h
+++ b/src/tools/qmutexpool_p.h
@@ -51,13 +51,13 @@
 //
 //
 
-#ifdef TQT_THREAD_SUPPORT
-
 #ifndef QT_H
 #include "ntqmutex.h"
 #include "ntqmemarray.h"
 #endif // QT_H
 
+#ifdef TQT_THREAD_SUPPORT
+
 class TQ_EXPORT TQMutexPool
 {
 public:
diff --git a/src/tools/qsemaphore.cpp b/src/tools/qsemaphore.cpp
index 810837b4..394834fd 100644
--- a/src/tools/qsemaphore.cpp
+++ b/src/tools/qsemaphore.cpp
@@ -38,6 +38,8 @@
 **
 **********************************************************************/
 
+#include "ntqglobal.h"
+
 #if defined(TQT_THREAD_SUPPORT)
 
 #include "ntqsemaphore.h"
diff --git a/src/tools/qthreadinstance_p.h b/src/tools/qthreadinstance_p.h
index 14f0de59..57244452 100644
--- a/src/tools/qthreadinstance_p.h
+++ b/src/tools/qthreadinstance_p.h
@@ -51,13 +51,13 @@
 //
 //
 
-#ifdef TQT_THREAD_SUPPORT
-
 #ifndef QT_H
 #include "ntqmutex.h"
 #include "ntqwindowdefs.h"
 #endif // QT_H
 
+#ifdef TQT_THREAD_SUPPORT
+
 #ifdef Q_OS_UNIX
 #include <pthread.h>
 #endif
diff --git a/src/tools/qthreadstorage_unix.cpp b/src/tools/qthreadstorage_unix.cpp
index d53f6fb6..7e34690b 100644
--- a/src/tools/qthreadstorage_unix.cpp
+++ b/src/tools/qthreadstorage_unix.cpp
@@ -36,6 +36,8 @@
 **
 **********************************************************************/
 
+#include "ntqglobal.h"
+
 #ifdef TQT_THREAD_SUPPORT
 
 #include "qplatformdefs.h"
diff --git a/src/tools/qwaitcondition_unix.cpp b/src/tools/qwaitcondition_unix.cpp
index 62038bae..866c524f 100644
--- a/src/tools/qwaitcondition_unix.cpp
+++ b/src/tools/qwaitcondition_unix.cpp
@@ -38,6 +38,8 @@
 **
 **********************************************************************/
 
+#include "ntqglobal.h"
+
 #if defined(TQT_THREAD_SUPPORT)
 
 #include "qplatformdefs.h"