Conversion QT_THREAD_SUPPORT -> TQT_THREAD_SUPPORT. This is part of the

qt->tqt conversion and is required to align to corresponding patch for
common/admin module.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

121 files changed, 545 insertions, 545 deletions

diff --git a/doc/html/qapplication-h.html b/doc/html/qapplication-h.html
index 157ba7f0..25bb4c0f 100644
--- a/doc/html/qapplication-h.html
+++ b/doc/html/qapplication-h.html
@@ -94,9 +94,9 @@ class TQEventLoop;
 class TQWSDecoration;
 #endif
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 class TQMutex;
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
 
 class TQApplication;
@@ -316,7 +316,7 @@ public:
     static bool x11_apply_settings();
 #endif
     void	     wakeUpGuiThread();
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     void	     lock();
     void	     unlock(bool wakeUpGui = TRUE);
     bool	     locked();
@@ -367,9 +367,9 @@ private:
     friend void tqt_init(int *, char **, TQApplication::Type);
 #endif
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
     static TQMutex   *tqt_mutex;
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
     int		     app_argc;
     char	   **app_argv;
diff --git a/doc/html/qeventloop-h.html b/doc/html/qeventloop-h.html
index 2e69ef0f..2221f85b 100644
--- a/doc/html/qeventloop-h.html
+++ b/doc/html/qeventloop-h.html
@@ -88,9 +88,9 @@ struct timeval; //stdc struct
 struct TimerInfo; //internal structure (qeventloop_mac.cpp)
 #endif
 
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 class TQMutex;
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
 
 class Q_EXPORT TQEventLoop : public TQObject
diff --git a/doc/html/qmake-manual-6.html b/doc/html/qmake-manual-6.html
index 8e4fdfee..cea91e19 100644
--- a/doc/html/qmake-manual-6.html
+++ b/doc/html/qmake-manual-6.html
@@ -101,20 +101,20 @@ body { background: #ffffff; color: black; }
 <pre>
     win32 {
         thread {
-            DEFINES += QT_THREAD_SUPPORT
+            DEFINES += TQT_THREAD_SUPPORT
         }
     }
 </pre>
 <p>To save writing many nested scopes, you can nest scopes using a colon like this:</p>
 <pre>
     win32:thread {
-        DEFINES += QT_THREAD_SUPPORT
+        DEFINES += TQT_THREAD_SUPPORT
     }
 </pre>
 <p>Once a test has been performed you may also do else/elseif operations. With this you may easily write complicated tests. This can be done with the special 'else' scope, it can be combined with other scopes (separated by colons as above) for example:</p>
 <pre>
     win32:thread {
-        DEFINES += QT_THREAD_SUPPORT
+        DEFINES += TQT_THREAD_SUPPORT
     } else:debug {
         DEFINES += QT_NOTHREAD_DEBUG
     } else {
@@ -166,10 +166,10 @@ body { background: #ffffff; color: black; }
 <p>If <em>value</em> is in the list of values stored in the variable called <em>variablename</em>, then the settings inside the scope will be processed. For example:</p>
 <pre>
     contains( CONFIG, thread ) {
-        DEFINES += QT_THREAD_SUPPORT
+        DEFINES += TQT_THREAD_SUPPORT
     }
 </pre>
-<p>If <em>thread</em> is in the list of values for the <em>CONFIG</em> variable, then QT_THREAD_SUPPORT will be added to the list of values in the <em>DEFINES</em> variable.</p>
+<p>If <em>thread</em> is in the list of values for the <em>CONFIG</em> variable, then TQT_THREAD_SUPPORT will be added to the list of values in the <em>DEFINES</em> variable.</p>
 <h4><a name="5-2"></a>count( variablename, number )</h4>
 <p>If <em>number</em> matches the number of values stored in the variable called <em>variablename</em>, then the settings inside the scope will be processed. For example:</p>
 <pre>
diff --git a/doc/html/qmutex-h.html b/doc/html/qmutex-h.html
index 724fe6e7..c811e5a3 100644
--- a/doc/html/qmutex-h.html
+++ b/doc/html/qmutex-h.html
@@ -81,7 +81,7 @@ body { background: #ffffff; color: black; }
 #include "ntqglobal.h"
 #endif // QT_H
 
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 
 class TQMutexPrivate;
 
diff --git a/doc/html/qsemaphore-h.html b/doc/html/qsemaphore-h.html
index b92e7cd3..25bb2dd9 100644
--- a/doc/html/qsemaphore-h.html
+++ b/doc/html/qsemaphore-h.html
@@ -81,7 +81,7 @@ body { background: #ffffff; color: black; }
 #include "ntqglobal.h"
 #endif // QT_H
 
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 
 class TQSemaphorePrivate;
 
diff --git a/doc/html/qthread-h.html b/doc/html/qthread-h.html
index 0dc79aab..26d6d7b7 100644
--- a/doc/html/qthread-h.html
+++ b/doc/html/qthread-h.html
@@ -77,7 +77,7 @@ body { background: #ffffff; color: black; }
 #ifndef TQTHREAD_H
 #define TQTHREAD_H
 
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 
 #ifndef QT_H
 #include "ntqwindowdefs.h"
@@ -161,7 +161,7 @@ private:
 #endif // TQ_DISABLE_COPY
 };
 
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
 #endif // TQTHREAD_H
 </pre>
diff --git a/doc/html/qthreadstorage-h.html b/doc/html/qthreadstorage-h.html
index f8054c68..7c60605b 100644
--- a/doc/html/qthreadstorage-h.html
+++ b/doc/html/qthreadstorage-h.html
@@ -75,7 +75,7 @@ body { background: #ffffff; color: black; }
 #ifndef TQTHREADSTORAGE_H
 #define TQTHREADSTORAGE_H
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 
 #ifndef QT_H
 #include "ntqglobal.h"
@@ -126,7 +126,7 @@ public:
     { (void) d.set( t ); }
 };
 
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
 #endif // TQTHREADSTORAGE_H
 </pre>
diff --git a/doc/html/qwaitcondition-h.html b/doc/html/qwaitcondition-h.html
index e28021a8..bc5a7336 100644
--- a/doc/html/qwaitcondition-h.html
+++ b/doc/html/qwaitcondition-h.html
@@ -81,7 +81,7 @@ body { background: #ffffff; color: black; }
 #include "ntqglobal.h"
 #endif // QT_H
 
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 
 #include &lt;limits.h&gt;
 
diff --git a/doc/html/threads.html b/doc/html/threads.html
index 16027c1c..6e13f248 100644
--- a/doc/html/threads.html
+++ b/doc/html/threads.html
@@ -81,8 +81,8 @@ such as with a special libc, installation will create a separate
 library, <tt>libtqt-mt</tt> and hence threaded programs must be linked
 against this library (with <tt>-ltqt-mt</tt>) rather than the standard TQt
 library.
-<p> On both platforms, you should compile with the macro <tt>QT_THREAD_SUPPORT</tt> defined (e.g. compile with
-<tt>-DQT_THREAD_SUPPORT</tt>). On Windows, this is usually done by an
+<p> On both platforms, you should compile with the macro <tt>TQT_THREAD_SUPPORT</tt> defined (e.g. compile with
+<tt>-DTQT_THREAD_SUPPORT</tt>). On Windows, this is usually done by an
 entry in <tt>ntqconfig.h</tt>.
 <p> <h2> The Thread Classes
 </h2>
diff --git a/doc/threads.doc b/doc/threads.doc
index ee91ba30..f6226c03 100644
--- a/doc/threads.doc
+++ b/doc/threads.doc
@@ -69,8 +69,8 @@ against this library (with \c{-ltqt-mt}) rather than the standard Qt
 library.
 
 On both platforms, you should compile with the macro \c
-QT_THREAD_SUPPORT defined (e.g. compile with
-\c{-DQT_THREAD_SUPPORT}). On Windows, this is usually done by an
+TQT_THREAD_SUPPORT defined (e.g. compile with
+\c{-DTQT_THREAD_SUPPORT}). On Windows, this is usually done by an
 entry in \c{ntqconfig.h}.
 
 \section1 The Thread Classes
diff --git a/mkspecs/aix-g++-64/qplatformdefs.h b/mkspecs/aix-g++-64/qplatformdefs.h
index 13c13ae0..f4c5fdce 100644
--- a/mkspecs/aix-g++-64/qplatformdefs.h
+++ b/mkspecs/aix-g++-64/qplatformdefs.h
@@ -13,7 +13,7 @@
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 // uncomment if you have problems with <sys/proc.h> because your gcc
 // hasn't been built on exactly the same OS version your are using now.
 // typedef int crid_t;
diff --git a/mkspecs/aix-g++/qplatformdefs.h b/mkspecs/aix-g++/qplatformdefs.h
index 20d2579e..2cd7a7e6 100644
--- a/mkspecs/aix-g++/qplatformdefs.h
+++ b/mkspecs/aix-g++/qplatformdefs.h
@@ -13,7 +13,7 @@
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 // uncomment if you have problems with <sys/proc.h> because your gcc
 // hasn't been built on exactly the same OS version your are using now.
 // typedef int crid_t;
diff --git a/mkspecs/aix-xlc-64/qplatformdefs.h b/mkspecs/aix-xlc-64/qplatformdefs.h
index 829f4e3a..af1b26fc 100644
--- a/mkspecs/aix-xlc-64/qplatformdefs.h
+++ b/mkspecs/aix-xlc-64/qplatformdefs.h
@@ -13,7 +13,7 @@
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include <pthread.h>
 #endif
 
diff --git a/mkspecs/aix-xlc/qplatformdefs.h b/mkspecs/aix-xlc/qplatformdefs.h
index ae10278e..b88ae925 100644
--- a/mkspecs/aix-xlc/qplatformdefs.h
+++ b/mkspecs/aix-xlc/qplatformdefs.h
@@ -13,7 +13,7 @@
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include <pthread.h>
 #endif
 
diff --git a/mkspecs/bsdi-g++/qplatformdefs.h b/mkspecs/bsdi-g++/qplatformdefs.h
index cd2fcd94..564c4127 100644
--- a/mkspecs/bsdi-g++/qplatformdefs.h
+++ b/mkspecs/bsdi-g++/qplatformdefs.h
@@ -13,7 +13,7 @@
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include <pthread.h>
 #endif
 
diff --git a/mkspecs/cygwin-g++/qplatformdefs.h b/mkspecs/cygwin-g++/qplatformdefs.h
index e2875b2d..d9baae88 100644
--- a/mkspecs/cygwin-g++/qplatformdefs.h
+++ b/mkspecs/cygwin-g++/qplatformdefs.h
@@ -29,7 +29,7 @@
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include <pthread.h>
 #endif
 
diff --git a/mkspecs/darwin-g++/qplatformdefs.h b/mkspecs/darwin-g++/qplatformdefs.h
index 0ad4f6b5..8b72e3f3 100644
--- a/mkspecs/darwin-g++/qplatformdefs.h
+++ b/mkspecs/darwin-g++/qplatformdefs.h
@@ -13,7 +13,7 @@
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include <pthread.h>
 #endif
 
diff --git a/mkspecs/dgux-g++/qplatformdefs.h b/mkspecs/dgux-g++/qplatformdefs.h
index 613fb374..b826f66b 100644
--- a/mkspecs/dgux-g++/qplatformdefs.h
+++ b/mkspecs/dgux-g++/qplatformdefs.h
@@ -18,7 +18,7 @@
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include <pthread.h>
 #endif
 
diff --git a/mkspecs/freebsd-clang/qplatformdefs.h b/mkspecs/freebsd-clang/qplatformdefs.h
index 876fc423..b6cb67d2 100644
--- a/mkspecs/freebsd-clang/qplatformdefs.h
+++ b/mkspecs/freebsd-clang/qplatformdefs.h
@@ -13,7 +13,7 @@
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include <pthread.h>
 #endif
 
diff --git a/mkspecs/freebsd-g++/qplatformdefs.h b/mkspecs/freebsd-g++/qplatformdefs.h
index 876fc423..b6cb67d2 100644
--- a/mkspecs/freebsd-g++/qplatformdefs.h
+++ b/mkspecs/freebsd-g++/qplatformdefs.h
@@ -13,7 +13,7 @@
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include <pthread.h>
 #endif
 
diff --git a/mkspecs/freebsd-icc/qplatformdefs.h b/mkspecs/freebsd-icc/qplatformdefs.h
index 876fc423..b6cb67d2 100644
--- a/mkspecs/freebsd-icc/qplatformdefs.h
+++ b/mkspecs/freebsd-icc/qplatformdefs.h
@@ -13,7 +13,7 @@
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include <pthread.h>
 #endif
 
diff --git a/mkspecs/hpux-acc-64/qplatformdefs.h b/mkspecs/hpux-acc-64/qplatformdefs.h
index 565a8585..2168d30b 100644
--- a/mkspecs/hpux-acc-64/qplatformdefs.h
+++ b/mkspecs/hpux-acc-64/qplatformdefs.h
@@ -13,7 +13,7 @@
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include <pthread.h>
 #endif
 
diff --git a/mkspecs/hpux-acc-o64/qplatformdefs.h b/mkspecs/hpux-acc-o64/qplatformdefs.h
index 104ce74b..b60ff1e5 100644
--- a/mkspecs/hpux-acc-o64/qplatformdefs.h
+++ b/mkspecs/hpux-acc-o64/qplatformdefs.h
@@ -13,7 +13,7 @@
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include <pthread.h>
 #endif
 
diff --git a/mkspecs/hpux-acc/qplatformdefs.h b/mkspecs/hpux-acc/qplatformdefs.h
index 31d01dea..e47f153f 100644
--- a/mkspecs/hpux-acc/qplatformdefs.h
+++ b/mkspecs/hpux-acc/qplatformdefs.h
@@ -13,7 +13,7 @@
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include <pthread.h>
 #endif
 
diff --git a/mkspecs/hpux-cc/qplatformdefs.h b/mkspecs/hpux-cc/qplatformdefs.h
index af22356d..4e2d9fb2 100644
--- a/mkspecs/hpux-cc/qplatformdefs.h
+++ b/mkspecs/hpux-cc/qplatformdefs.h
@@ -13,7 +13,7 @@
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include <pthread.h>
 #endif
 
diff --git a/mkspecs/hpux-g++-64/qplatformdefs.h b/mkspecs/hpux-g++-64/qplatformdefs.h
index 565a8585..2168d30b 100644
--- a/mkspecs/hpux-g++-64/qplatformdefs.h
+++ b/mkspecs/hpux-g++-64/qplatformdefs.h
@@ -13,7 +13,7 @@
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include <pthread.h>
 #endif
 
diff --git a/mkspecs/hpux-g++/qplatformdefs.h b/mkspecs/hpux-g++/qplatformdefs.h
index 040be482..38e3ac63 100644
--- a/mkspecs/hpux-g++/qplatformdefs.h
+++ b/mkspecs/hpux-g++/qplatformdefs.h
@@ -13,7 +13,7 @@
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include <pthread.h>
 #endif
 
diff --git a/mkspecs/hpuxi-acc-32/qplatformdefs.h b/mkspecs/hpuxi-acc-32/qplatformdefs.h
index 104ce74b..b60ff1e5 100644
--- a/mkspecs/hpuxi-acc-32/qplatformdefs.h
+++ b/mkspecs/hpuxi-acc-32/qplatformdefs.h
@@ -13,7 +13,7 @@
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include <pthread.h>
 #endif
 
diff --git a/mkspecs/hpuxi-acc-64/qplatformdefs.h b/mkspecs/hpuxi-acc-64/qplatformdefs.h
index 104ce74b..b60ff1e5 100644
--- a/mkspecs/hpuxi-acc-64/qplatformdefs.h
+++ b/mkspecs/hpuxi-acc-64/qplatformdefs.h
@@ -13,7 +13,7 @@
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include <pthread.h>
 #endif
 
diff --git a/mkspecs/hurd-g++/qplatformdefs.h b/mkspecs/hurd-g++/qplatformdefs.h
index f05d0764..4871b722 100644
--- a/mkspecs/hurd-g++/qplatformdefs.h
+++ b/mkspecs/hurd-g++/qplatformdefs.h
@@ -30,7 +30,7 @@
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include <pthread.h>
 #endif
 
diff --git a/mkspecs/irix-cc-64/qplatformdefs.h b/mkspecs/irix-cc-64/qplatformdefs.h
index cc8603a8..d91df8d4 100644
--- a/mkspecs/irix-cc-64/qplatformdefs.h
+++ b/mkspecs/irix-cc-64/qplatformdefs.h
@@ -13,7 +13,7 @@
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include <pthread.h>
 #endif
 
diff --git a/mkspecs/irix-cc-o32/qplatformdefs.h b/mkspecs/irix-cc-o32/qplatformdefs.h
index 9c63b112..6c8f7f11 100644
--- a/mkspecs/irix-cc-o32/qplatformdefs.h
+++ b/mkspecs/irix-cc-o32/qplatformdefs.h
@@ -13,7 +13,7 @@
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include <pthread.h>
 #endif
 
diff --git a/mkspecs/irix-cc/qplatformdefs.h b/mkspecs/irix-cc/qplatformdefs.h
index cc8603a8..d91df8d4 100644
--- a/mkspecs/irix-cc/qplatformdefs.h
+++ b/mkspecs/irix-cc/qplatformdefs.h
@@ -13,7 +13,7 @@
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include <pthread.h>
 #endif
 
diff --git a/mkspecs/irix-g++/qplatformdefs.h b/mkspecs/irix-g++/qplatformdefs.h
index ec7ddf3d..7cd2f2e0 100644
--- a/mkspecs/irix-g++/qplatformdefs.h
+++ b/mkspecs/irix-g++/qplatformdefs.h
@@ -13,7 +13,7 @@
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include <pthread.h>
 #endif
 
diff --git a/mkspecs/linux-clang/qplatformdefs.h b/mkspecs/linux-clang/qplatformdefs.h
index 9a9540ce..67e61785 100644
--- a/mkspecs/linux-clang/qplatformdefs.h
+++ b/mkspecs/linux-clang/qplatformdefs.h
@@ -29,7 +29,7 @@
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include <pthread.h>
 #endif
 
diff --git a/mkspecs/linux-cxx/qplatformdefs.h b/mkspecs/linux-cxx/qplatformdefs.h
index d832fa7e..c35609e1 100644
--- a/mkspecs/linux-cxx/qplatformdefs.h
+++ b/mkspecs/linux-cxx/qplatformdefs.h
@@ -29,7 +29,7 @@
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include <pthread.h>
 #endif
 
diff --git a/mkspecs/linux-ecc-64/qplatformdefs.h b/mkspecs/linux-ecc-64/qplatformdefs.h
index d832fa7e..c35609e1 100644
--- a/mkspecs/linux-ecc-64/qplatformdefs.h
+++ b/mkspecs/linux-ecc-64/qplatformdefs.h
@@ -29,7 +29,7 @@
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include <pthread.h>
 #endif
 
diff --git a/mkspecs/linux-g++-32/qplatformdefs.h b/mkspecs/linux-g++-32/qplatformdefs.h
index d832fa7e..c35609e1 100644
--- a/mkspecs/linux-g++-32/qplatformdefs.h
+++ b/mkspecs/linux-g++-32/qplatformdefs.h
@@ -29,7 +29,7 @@
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include <pthread.h>
 #endif
 
diff --git a/mkspecs/linux-g++-64/qplatformdefs.h b/mkspecs/linux-g++-64/qplatformdefs.h
index d832fa7e..c35609e1 100644
--- a/mkspecs/linux-g++-64/qplatformdefs.h
+++ b/mkspecs/linux-g++-64/qplatformdefs.h
@@ -29,7 +29,7 @@
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include <pthread.h>
 #endif
 
diff --git a/mkspecs/linux-g++-sparc/qplatformdefs.h b/mkspecs/linux-g++-sparc/qplatformdefs.h
index 9a9540ce..67e61785 100644
--- a/mkspecs/linux-g++-sparc/qplatformdefs.h
+++ b/mkspecs/linux-g++-sparc/qplatformdefs.h
@@ -29,7 +29,7 @@
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include <pthread.h>
 #endif
 
diff --git a/mkspecs/linux-g++/qplatformdefs.h b/mkspecs/linux-g++/qplatformdefs.h
index 9a9540ce..67e61785 100644
--- a/mkspecs/linux-g++/qplatformdefs.h
+++ b/mkspecs/linux-g++/qplatformdefs.h
@@ -29,7 +29,7 @@
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include <pthread.h>
 #endif
 
diff --git a/mkspecs/linux-icc/qplatformdefs.h b/mkspecs/linux-icc/qplatformdefs.h
index d832fa7e..c35609e1 100644
--- a/mkspecs/linux-icc/qplatformdefs.h
+++ b/mkspecs/linux-icc/qplatformdefs.h
@@ -29,7 +29,7 @@
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include <pthread.h>
 #endif
 
diff --git a/mkspecs/linux-kcc/qplatformdefs.h b/mkspecs/linux-kcc/qplatformdefs.h
index c78a1a27..692b8d1e 100644
--- a/mkspecs/linux-kcc/qplatformdefs.h
+++ b/mkspecs/linux-kcc/qplatformdefs.h
@@ -29,7 +29,7 @@
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include <pthread.h>
 #endif
 
diff --git a/mkspecs/linux-kylix/qplatformdefs.h b/mkspecs/linux-kylix/qplatformdefs.h
index d832fa7e..c35609e1 100644
--- a/mkspecs/linux-kylix/qplatformdefs.h
+++ b/mkspecs/linux-kylix/qplatformdefs.h
@@ -29,7 +29,7 @@
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include <pthread.h>
 #endif
 
diff --git a/mkspecs/linux-pgcc/qplatformdefs.h b/mkspecs/linux-pgcc/qplatformdefs.h
index d832fa7e..c35609e1 100644
--- a/mkspecs/linux-pgcc/qplatformdefs.h
+++ b/mkspecs/linux-pgcc/qplatformdefs.h
@@ -29,7 +29,7 @@
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include <pthread.h>
 #endif
 
diff --git a/mkspecs/lynxos-g++/qplatformdefs.h b/mkspecs/lynxos-g++/qplatformdefs.h
index 3eca98af..bf9cc349 100644
--- a/mkspecs/lynxos-g++/qplatformdefs.h
+++ b/mkspecs/lynxos-g++/qplatformdefs.h
@@ -13,7 +13,7 @@
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include <pthread.h>
 #endif
 
diff --git a/mkspecs/macx-g++/qplatformdefs.h b/mkspecs/macx-g++/qplatformdefs.h
index c03f5072..7ed97a07 100644
--- a/mkspecs/macx-g++/qplatformdefs.h
+++ b/mkspecs/macx-g++/qplatformdefs.h
@@ -13,7 +13,7 @@
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include <pthread.h>
 #endif
 
diff --git a/mkspecs/macx-mwerks/qplatformdefs.h b/mkspecs/macx-mwerks/qplatformdefs.h
index f2d396cd..dedac14e 100644
--- a/mkspecs/macx-mwerks/qplatformdefs.h
+++ b/mkspecs/macx-mwerks/qplatformdefs.h
@@ -13,7 +13,7 @@
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include <pthread.h>
 #endif
 
diff --git a/mkspecs/macx-pbuilder/qplatformdefs.h b/mkspecs/macx-pbuilder/qplatformdefs.h
index c03f5072..7ed97a07 100644
--- a/mkspecs/macx-pbuilder/qplatformdefs.h
+++ b/mkspecs/macx-pbuilder/qplatformdefs.h
@@ -13,7 +13,7 @@
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include <pthread.h>
 #endif
 
diff --git a/mkspecs/macx-xlc/qplatformdefs.h b/mkspecs/macx-xlc/qplatformdefs.h
index c03f5072..7ed97a07 100644
--- a/mkspecs/macx-xlc/qplatformdefs.h
+++ b/mkspecs/macx-xlc/qplatformdefs.h
@@ -13,7 +13,7 @@
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include <pthread.h>
 #endif
 
diff --git a/mkspecs/netbsd-g++/qplatformdefs.h b/mkspecs/netbsd-g++/qplatformdefs.h
index bc5e6c82..dd228457 100644
--- a/mkspecs/netbsd-g++/qplatformdefs.h
+++ b/mkspecs/netbsd-g++/qplatformdefs.h
@@ -13,7 +13,7 @@
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include <pthread.h>
 #endif
 
diff --git a/mkspecs/openbsd-g++/qplatformdefs.h b/mkspecs/openbsd-g++/qplatformdefs.h
index 9f3d17a7..0e50be02 100644
--- a/mkspecs/openbsd-g++/qplatformdefs.h
+++ b/mkspecs/openbsd-g++/qplatformdefs.h
@@ -13,7 +13,7 @@
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include <pthread.h>
 #endif
 
diff --git a/mkspecs/qnx-g++/qplatformdefs.h b/mkspecs/qnx-g++/qplatformdefs.h
index b1fbd355..9b47fcd6 100644
--- a/mkspecs/qnx-g++/qplatformdefs.h
+++ b/mkspecs/qnx-g++/qplatformdefs.h
@@ -13,7 +13,7 @@
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include <pthread.h>
 #endif
 
diff --git a/mkspecs/reliant-cds-64/qplatformdefs.h b/mkspecs/reliant-cds-64/qplatformdefs.h
index e456b47b..eca031af 100644
--- a/mkspecs/reliant-cds-64/qplatformdefs.h
+++ b/mkspecs/reliant-cds-64/qplatformdefs.h
@@ -13,7 +13,7 @@
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include <pthread.h>
 #endif
 
diff --git a/mkspecs/reliant-cds/qplatformdefs.h b/mkspecs/reliant-cds/qplatformdefs.h
index ab6da166..978e57c2 100644
--- a/mkspecs/reliant-cds/qplatformdefs.h
+++ b/mkspecs/reliant-cds/qplatformdefs.h
@@ -13,7 +13,7 @@
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include <pthread.h>
 #endif
 
diff --git a/mkspecs/sco-cc/qplatformdefs.h b/mkspecs/sco-cc/qplatformdefs.h
index 024add0a..21ebf4c1 100644
--- a/mkspecs/sco-cc/qplatformdefs.h
+++ b/mkspecs/sco-cc/qplatformdefs.h
@@ -13,7 +13,7 @@
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include <pthread.h>
 #endif
 
diff --git a/mkspecs/sco-g++/qplatformdefs.h b/mkspecs/sco-g++/qplatformdefs.h
index 41c5a697..5422cfa3 100644
--- a/mkspecs/sco-g++/qplatformdefs.h
+++ b/mkspecs/sco-g++/qplatformdefs.h
@@ -18,7 +18,7 @@
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include <pthread.h>
 #endif
 
diff --git a/mkspecs/solaris-cc-64/qplatformdefs.h b/mkspecs/solaris-cc-64/qplatformdefs.h
index 3001bf25..63114609 100644
--- a/mkspecs/solaris-cc-64/qplatformdefs.h
+++ b/mkspecs/solaris-cc-64/qplatformdefs.h
@@ -13,7 +13,7 @@
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include <pthread.h>
 #endif
 
diff --git a/mkspecs/solaris-cc/qplatformdefs.h b/mkspecs/solaris-cc/qplatformdefs.h
index 8f8c665d..8c3606d5 100644
--- a/mkspecs/solaris-cc/qplatformdefs.h
+++ b/mkspecs/solaris-cc/qplatformdefs.h
@@ -14,7 +14,7 @@
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include <pthread.h>
 #endif
 
diff --git a/mkspecs/solaris-g++-64/qplatformdefs.h b/mkspecs/solaris-g++-64/qplatformdefs.h
index c2c050c8..d3fab7ea 100644
--- a/mkspecs/solaris-g++-64/qplatformdefs.h
+++ b/mkspecs/solaris-g++-64/qplatformdefs.h
@@ -16,7 +16,7 @@
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include <pthread.h>
 #endif
 
diff --git a/mkspecs/solaris-g++/qplatformdefs.h b/mkspecs/solaris-g++/qplatformdefs.h
index fe898438..c27f28d7 100644
--- a/mkspecs/solaris-g++/qplatformdefs.h
+++ b/mkspecs/solaris-g++/qplatformdefs.h
@@ -16,7 +16,7 @@
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include <pthread.h>
 #endif
 
diff --git a/mkspecs/tru64-cxx/qplatformdefs.h b/mkspecs/tru64-cxx/qplatformdefs.h
index ea11d554..98e44b64 100644
--- a/mkspecs/tru64-cxx/qplatformdefs.h
+++ b/mkspecs/tru64-cxx/qplatformdefs.h
@@ -13,7 +13,7 @@
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include <pthread.h>
 #endif
 
diff --git a/mkspecs/tru64-g++/qplatformdefs.h b/mkspecs/tru64-g++/qplatformdefs.h
index 994f3847..89c2d2e3 100644
--- a/mkspecs/tru64-g++/qplatformdefs.h
+++ b/mkspecs/tru64-g++/qplatformdefs.h
@@ -13,7 +13,7 @@
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include <pthread.h>
 #endif
 
diff --git a/mkspecs/unixware-cc/qplatformdefs.h b/mkspecs/unixware-cc/qplatformdefs.h
index 024add0a..21ebf4c1 100644
--- a/mkspecs/unixware-cc/qplatformdefs.h
+++ b/mkspecs/unixware-cc/qplatformdefs.h
@@ -13,7 +13,7 @@
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include <pthread.h>
 #endif
 
diff --git a/mkspecs/unixware-g++/qplatformdefs.h b/mkspecs/unixware-g++/qplatformdefs.h
index 024add0a..21ebf4c1 100644
--- a/mkspecs/unixware-g++/qplatformdefs.h
+++ b/mkspecs/unixware-g++/qplatformdefs.h
@@ -13,7 +13,7 @@
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include <pthread.h>
 #endif
 
diff --git a/qmake/book/qmake-advanced.leaf b/qmake/book/qmake-advanced.leaf
index d1b8c4b1..e4d7621b 100644
--- a/qmake/book/qmake-advanced.leaf
+++ b/qmake/book/qmake-advanced.leaf
@@ -141,7 +141,7 @@ this:
 \code
     win32 {
 	thread {
-	    DEFINES += QT_THREAD_SUPPORT
+	    DEFINES += TQT_THREAD_SUPPORT
 	}
     }
 \endcode
@@ -151,7 +151,7 @@ like this:
 
 \code
     win32:thread {
-	DEFINES += QT_THREAD_SUPPORT
+	DEFINES += TQT_THREAD_SUPPORT
     }
 \endcode
 
@@ -162,7 +162,7 @@ colons as above) for example:
 
 \code
     win32:thread {
-	DEFINES += QT_THREAD_SUPPORT
+	DEFINES += TQT_THREAD_SUPPORT
     } else:debug {
 	DEFINES += QT_NOTHREAD_DEBUG
     } else {
@@ -276,12 +276,12 @@ For example:
 
 \code
     contains( CONFIG, thread ) {
-	DEFINES += QT_THREAD_SUPPORT
+	DEFINES += TQT_THREAD_SUPPORT
     }
 \endcode
 
 If \e thread is in the list of values for the \e CONFIG variable, then
-QT_THREAD_SUPPORT will be added to the list of values in the \e
+TQT_THREAD_SUPPORT will be added to the list of values in the \e
 DEFINES variable.
 
 \section2 count( variablename, number )
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
index d796e4d7..d018904c 100644
--- a/qmake/generators/unix/unixmake.cpp
+++ b/qmake/generators/unix/unixmake.cpp
@@ -229,7 +229,7 @@ UnixMakefileGenerator::init()
 	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("QT_THREAD_SUPPORT");
+	    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 41666e3a..8a565822 100644
--- a/qmake/generators/win32/borland_bmake.cpp
+++ b/qmake/generators/win32/borland_bmake.cpp
@@ -427,7 +427,7 @@ BorlandMakefileGenerator::init()
     }
     if(project->isActiveConfig("qt")) {
 	if ( project->isActiveConfig("thread") )
-	    project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_THREAD_SUPPORT");
+	    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 a082a4aa..3c4c33c6 100644
--- a/qmake/generators/win32/mingw_make.cpp
+++ b/qmake/generators/win32/mingw_make.cpp
@@ -428,7 +428,7 @@ MingwMakefileGenerator::init()
 		project->variables()["CONFIG"].append("dll");
 	}
 	if ( project->isActiveConfig("thread") ) {
-            project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_THREAD_SUPPORT");
+            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"];
diff --git a/qmake/generators/win32/msvc_dsp.cpp b/qmake/generators/win32/msvc_dsp.cpp
index f28969be..4e51417d 100644
--- a/qmake/generators/win32/msvc_dsp.cpp
+++ b/qmake/generators/win32/msvc_dsp.cpp
@@ -747,7 +747,7 @@ DspMakefileGenerator::init()
     }
     if ( thread ) {
 	if(project->isActiveConfig("qt"))
-	    project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_THREAD_SUPPORT" );
+	    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 75138b6c..f813b4cb 100644
--- a/qmake/generators/win32/msvc_nmake.cpp
+++ b/qmake/generators/win32/msvc_nmake.cpp
@@ -512,7 +512,7 @@ NmakeMakefileGenerator::init()
 		project->variables()["CONFIG"].append("dll");
 	}
 	if ( project->isActiveConfig("thread") )
-	    project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_THREAD_SUPPORT");
+	    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 625ccf37..b294e1c3 100644
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -483,7 +483,7 @@ void VcprojGenerator::init()
 	}
 
 	if( project->isActiveConfig("thread") ) {
-	    project->variables()["DEFINES"] += "QT_THREAD_SUPPORT";
+	    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"];
@@ -1209,7 +1209,7 @@ void VcprojGenerator::initOld()
     // THREAD --------------------------------------------------------
     if ( project->isActiveConfig("thread") ) {
 	if(project->isActiveConfig("qt"))
-	    project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_THREAD_SUPPORT" );
+	    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/codecs/qtextcodec.cpp b/src/codecs/qtextcodec.cpp
index 6de93356..764aacb8 100644
--- a/src/codecs/qtextcodec.cpp
+++ b/src/codecs/qtextcodec.cpp
@@ -75,9 +75,9 @@
 #  include "qfontcodecs_p.h"
 #endif
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #  include <private/qmutexpool_p.h>
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
 #include <stdlib.h>
 #include <ctype.h>
@@ -121,12 +121,12 @@ void TQTextCodec::deleteAllCodecs()
     if ( !all )
 	return;
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
     TQMutexLocker locker( tqt_global_mutexpool ?
 			 tqt_global_mutexpool->get( &all ) : 0 );
     if ( !all )
 	return;
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
     destroying_is_ok = TRUE;
 
@@ -151,11 +151,11 @@ static inline void setup()
 {
     if ( all ) return;
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
     TQMutexLocker locker( tqt_global_mutexpool ?
 			 tqt_global_mutexpool->get( &all ) : 0 );
     if ( all ) return;
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
     realSetup();
 }
diff --git a/src/codecs/qtextcodecfactory.cpp b/src/codecs/qtextcodecfactory.cpp
index aad0ac2b..29ee86e0 100644
--- a/src/codecs/qtextcodecfactory.cpp
+++ b/src/codecs/qtextcodecfactory.cpp
@@ -48,9 +48,9 @@
 #include <private/qpluginmanager_p.h>
 #include "qtextcodecinterface_p.h"
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #  include <private/qmutexpool_p.h>
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
 #include <stdlib.h>
 
@@ -63,7 +63,7 @@ static void create_manager()
     if ( manager ) // already created
 	return;
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
     // protect manager creation
     TQMutexLocker locker( tqt_global_mutexpool ?
 			 tqt_global_mutexpool->get( &manager ) : 0);
diff --git a/src/dialogs/qfiledialog.cpp b/src/dialogs/qfiledialog.cpp
index e268ba1b..9e95e0c5 100644
--- a/src/dialogs/qfiledialog.cpp
+++ b/src/dialogs/qfiledialog.cpp
@@ -100,9 +100,9 @@
 #endif
 
 #ifdef Q_WS_WIN
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #  include <private/qmutexpool_p.h>
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 #endif // Q_WS_WIN
 
 #if !defined(Q_OS_TEMP)
@@ -527,7 +527,7 @@ static void resolveLibs()
     static bool triedResolve = FALSE;
 
     if ( !triedResolve ) {
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 	// protect initialization
 	TQMutexLocker locker( tqt_global_mutexpool ?
 			     tqt_global_mutexpool->get( &triedResolve ) : 0 );
@@ -3203,7 +3203,7 @@ void TQFileDialog::setDir( const TQString & pathstr )
 	    i++;
 	TQCString user;
 	if ( i == 1 ) {
-#if defined(QT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS)
+#if defined(TQT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS)
 
 #  ifndef _POSIX_LOGIN_NAME_MAX
 #    define _POSIX_LOGIN_NAME_MAX 9
@@ -3222,7 +3222,7 @@ void TQFileDialog::setDir( const TQString & pathstr )
 	    user = dr.mid( 1, i-1 ).local8Bit();
 	dr = dr.mid( i, dr.length() );
 	struct passwd *pw;
-#if defined(QT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_FREEBSD) && !defined(Q_OS_OPENBSD)
+#if defined(TQT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_FREEBSD) && !defined(Q_OS_OPENBSD)
 	struct passwd mt_pw;
 	char buffer[2048];
 	if ( ::getpwnam_r( user, &mt_pw, buffer, 2048, &pw ) == 0 && pw == &mt_pw )
diff --git a/src/inputmethod/qinputcontextfactory.cpp b/src/inputmethod/qinputcontextfactory.cpp
index 7f743d76..a15f659c 100644
--- a/src/inputmethod/qinputcontextfactory.cpp
+++ b/src/inputmethod/qinputcontextfactory.cpp
@@ -43,9 +43,9 @@
 
 #include "ntqapplication.h"
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include <private/qmutexpool_p.h>
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
 #include <stdlib.h>
 
@@ -62,7 +62,7 @@ static void create_manager()
     if( manager ) // already created
 	return;
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
     // protect manager creation
     TQMutexLocker locker( tqt_global_mutexpool ?
 			 tqt_global_mutexpool->get( &manager ) : 0);
diff --git a/src/kernel/ntqapplication.h b/src/kernel/ntqapplication.h
index 3618bf3b..f5060613 100644
--- a/src/kernel/ntqapplication.h
+++ b/src/kernel/ntqapplication.h
@@ -61,10 +61,10 @@ class TQIMEvent;
 class TQWSDecoration;
 #endif
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 class TQMutex;
 class TQThread;
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
 
 class TQApplication;
@@ -297,7 +297,7 @@ public:
     static bool x11_apply_settings();
 #endif
     void	     wakeUpGuiThread();
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     void	     lock();
     void	     unlock(bool wakeUpGui = TRUE);
     bool	     locked();
@@ -354,9 +354,9 @@ private slots:
 #endif
 
 public:
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
     static TQMutex   *tqt_mutex;
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
 private:
     int		     app_argc;
@@ -372,7 +372,7 @@ private:
 #ifndef QT_NO_CURSOR
     static TQCursor  *app_cursor;
 #endif
-#ifndef QT_THREAD_SUPPORT
+#ifndef TQT_THREAD_SUPPORT
     static TQEventLoop* eventloop;
 #endif
     static int	     app_tracking;
@@ -436,9 +436,9 @@ private:
     friend class TQDialog;
     friend class TQAccelManager;
     friend class TQEvent;
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
     friend class TQThread;
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
     friend class TQTranslator;
     friend class TQEventLoop;
     friend Q_EXPORT void tqt_ucm_initialize( TQApplication * );
@@ -458,7 +458,7 @@ private:
     static TQEventLoop* currentEventLoop();
 
 public:
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
     static TQThread* guiThread();
     static void threadTerminationHandler( TQThread * );
 #endif
diff --git a/src/kernel/ntqeventloop.h b/src/kernel/ntqeventloop.h
index f4d78bf2..cc76fb75 100644
--- a/src/kernel/ntqeventloop.h
+++ b/src/kernel/ntqeventloop.h
@@ -59,9 +59,9 @@ struct timeval; //stdc struct
 struct TimerInfo; //internal structure (qeventloop_mac.cpp)
 #endif
 
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 class TQMutex;
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
 
 class Q_EXPORT TQEventLoop : public TQObject
diff --git a/src/kernel/ntqgplugin.h b/src/kernel/ntqgplugin.h
index 135e6b81..7300c0f3 100644
--- a/src/kernel/ntqgplugin.h
+++ b/src/kernel/ntqgplugin.h
@@ -66,7 +66,7 @@
 #endif
 
 #ifndef Q_EXPORT_PLUGIN
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 #define QT_THREADED_BUILD 1
 #define Q_PLUGIN_FLAGS_STRING "11"
 #else
diff --git a/src/kernel/ntqobject.h b/src/kernel/ntqobject.h
index b2c9b2f5..c81dc9d3 100644
--- a/src/kernel/ntqobject.h
+++ b/src/kernel/ntqobject.h
@@ -64,7 +64,7 @@ class TQObjectUserData;
 #endif
 struct TQUObject;
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 class TQThread;
 #endif
 
@@ -230,14 +230,14 @@ private:	// Disabled copy constructor and operator=
 #endif
 
 public:
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
     TQThread* contextThreadObject() const;
     void moveToThread(TQThread *targetThread);
     void disableThreadPostedEvents(bool disable);
 #endif
 
 private:
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
     void moveToThread_helper(TQThread *targetThread);
     void setThreadObject_helper(TQThread *targetThread);
 #endif
diff --git a/src/kernel/ntqthread.h b/src/kernel/ntqthread.h
index 04684ac0..a38a2dfa 100644
--- a/src/kernel/ntqthread.h
+++ b/src/kernel/ntqthread.h
@@ -41,7 +41,7 @@
 #ifndef TQTHREAD_H
 #define TQTHREAD_H
 
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 
 #ifndef QT_H
 #include "ntqwindowdefs.h"
@@ -150,6 +150,6 @@ class Q_EXPORT TQEventLoopThread : public TQThread
         virtual void run();
 };
 
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
 #endif // TQTHREAD_H
diff --git a/src/kernel/qapplication.cpp b/src/kernel/qapplication.cpp
index f090e748..4ee67cd4 100644
--- a/src/kernel/qapplication.cpp
+++ b/src/kernel/qapplication.cpp
@@ -65,11 +65,11 @@
 #endif
 #include "qfontdata_p.h"
 
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 #  include "ntqmutex.h"
 #  include "ntqthread.h"
 #  include <private/qthreadinstance_p.h>
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
 #include <stdlib.h>
 
@@ -375,7 +375,7 @@ TQStringList *TQApplication::app_libpaths = 0;
 bool	  TQApplication::metaComposeUnicode = FALSE;
 int	  TQApplication::composedUnicode   = 0;
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 TQMutex *TQApplication::tqt_mutex		= 0;
 TQMutex *tqt_sharedStringMutex			= 0;
 Q_EXPORT TQMutex * tqt_sharedMetaObjectMutex	= 0;
@@ -388,13 +388,13 @@ Q_EXPORT TQt::HANDLE tqt_get_application_thread_id()
 {
     return tqt_application_thread_id;
 }
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
-#ifndef QT_THREAD_SUPPORT
+#ifndef TQT_THREAD_SUPPORT
 TQEventLoop *TQApplication::eventloop = 0;	// application event loop
 #endif
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 TQEventLoop* TQApplication::currentEventLoop() {
 	TQThread* thread = TQThread::currentThreadObject();
 	if (thread) {
@@ -541,7 +541,7 @@ TQClipboard	      *tqt_clipboard = 0;	// global clipboard object
 #endif
 TQWidgetList * tqt_modal_stack=0;		// stack of modal widgets
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 // thread wrapper for the main() thread
 class TQCoreApplicationThread : public TQThread
 {
@@ -605,9 +605,9 @@ static TQPostEventList *globalPostedEvents = 0;	// list of posted events
 
 uint qGlobalPostedEventsCount()
 {
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
     TQMutexLocker locker( postevent_mutex );
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
     if (!globalPostedEvents) {
 	return 0;
@@ -1035,7 +1035,7 @@ TQApplication::TQApplication(Display *dpy, int argc, char **argv,
 
 #endif // Q_WS_X11
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 TQThread* TQApplication::guiThread() {
 	return mainThread();
 }
@@ -1069,7 +1069,7 @@ void TQApplication::init_precmdline()
 
 void TQApplication::initialize( int argc, char **argv, bool enable_sm )
 {
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
     tqt_mutex = new TQMutex( TRUE );
     tqt_sharedStringMutex = new TQMutex( TRUE );
     tqt_sharedMetaObjectMutex = new TQMutex( TRUE );
@@ -1078,7 +1078,7 @@ void TQApplication::initialize( int argc, char **argv, bool enable_sm )
 #endif // QT_USE_GLIBMAINLOOP
     postevent_mutex = new TQMutex( TRUE );
     tqt_application_thread_id = TQThread::currentThread();
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
     app_argc = argc;
     app_argv = argv;
@@ -1226,12 +1226,12 @@ TQApplication::~TQApplication()
     app_libpaths = 0;
 #endif
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
     delete tqt_mutex;
     tqt_mutex = 0;
     delete postevent_mutex;
     postevent_mutex = 0;
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
     if( tqApp == this ) {
 	if ( postedEvents )
@@ -1254,7 +1254,7 @@ TQApplication::~TQApplication()
     session_key = 0;
 #endif //QT_NO_SESSIONMANAGER
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
     delete tqt_sharedMetaObjectMutex;
     tqt_sharedMetaObjectMutex = 0;
     delete tqt_sharedStringMutex;
@@ -1263,7 +1263,7 @@ TQApplication::~TQApplication()
     delete tqt_timerListMutex;
     tqt_timerListMutex = 0;
 #endif // QT_USE_GLIBMAINLOOP
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
     tqt_explicit_app_style = FALSE;
     tqt_app_has_font = FALSE;
@@ -2521,9 +2521,9 @@ bool TQApplication::notify( TQObject *receiver, TQEvent *e )
     }
 
     if ( e->type() == TQEvent::ChildRemoved && receiver->postedEvents) {
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 	TQMutexLocker locker( postevent_mutex );
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
 	if (globalPostedEvents) {
 		// the TQObject destructor calls TQObject::removeChild, which calls
@@ -2868,7 +2868,7 @@ bool TQApplication::internalNotify( TQObject *receiver, TQEvent * e)
     }
 
     if (!handled) {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	int locklevel = 0;
 	int llcount;
 	if (TQApplication::tqt_mutex) {
@@ -2881,7 +2881,7 @@ bool TQApplication::internalNotify( TQObject *receiver, TQEvent * e)
 	}
 #endif
 	consumed = receiver->event( e );
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	if (TQApplication::tqt_mutex) {
 	    for (llcount=0; llcount<locklevel; llcount++) {
 		TQApplication::tqt_mutex->lock();
@@ -3365,9 +3365,9 @@ void TQApplication::postEvent( TQObject *receiver, TQEvent *event )
 	return;
     }
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
     TQMutexLocker locker( postevent_mutex );
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
     if ( !globalPostedEvents ) {			// create list
 	globalPostedEvents = new TQPostEventList;
@@ -3461,7 +3461,7 @@ void TQApplication::postEvent( TQObject *receiver, TQEvent *event )
     l->append( pe );
     globalPostedEvents->append( pe );
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
      // Wake up the receiver thread event loop
      TQThread* thread = receiver->contextThreadObject();
      if (thread) {
@@ -3514,7 +3514,7 @@ void TQApplication::sendPostedEvents( TQObject *receiver, int event_type )
 	sendPostedEvents( 0, TQEvent::ChildInserted );
     }
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
     TQMutexLocker locker( postevent_mutex );
 #endif
 
@@ -3571,9 +3571,9 @@ void TQApplication::sendPostedEvents( TQObject *receiver, int event_type )
 		    }
 		}
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 		if ( locker.mutex() ) locker.mutex()->unlock();
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 		// after all that work, it's time to deliver the event.
 		if ( e->type() == TQEvent::Paint && r->isWidgetType() ) {
 		    TQWidget * w = (TQWidget*)r;
@@ -3585,9 +3585,9 @@ void TQApplication::sendPostedEvents( TQObject *receiver, int event_type )
 		    sent = TRUE;
 		    TQApplication::sendEvent( r, e );
 		}
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 		if ( locker.mutex() ) locker.mutex()->lock();
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
 		delete e;
 		// careful when adding anything below this point - the
@@ -3646,9 +3646,9 @@ void TQApplication::removePostedEvents( TQObject *receiver, int event_type )
 	return;
     }
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
     TQMutexLocker locker( postevent_mutex );
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
     // the TQObject destructor calls this function directly.  this can
     // happen while the event loop is in the middle of posting events,
@@ -3699,9 +3699,9 @@ void TQApplication::removePostedEvent( TQEvent *  event )
 	return;
     }
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
     TQMutexLocker locker( postevent_mutex );
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
     if ( !globalPostedEvents ) {
 #if defined(QT_DEBUG)
@@ -3797,7 +3797,7 @@ void TQApplication::removePostedEvent( TQEvent *  event )
 }
 
 void tqThreadTerminationHandlerRecursive( TQObject* object, TQThread* originThread, TQThread* destinationThread ) {
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 	TQThread* objectThread = object->contextThreadObject();
 	if (objectThread && (objectThread == originThread)) {
 		TQThread::CleanupType cleanupType = objectThread->cleanupType();
@@ -3822,7 +3822,7 @@ void tqThreadTerminationHandlerRecursive( TQObject* object, TQThread* originThre
 	for ( childObject = children.first(); childObject; childObject = children.next() ) {
 		tqThreadTerminationHandlerRecursive(childObject, originThread, destinationThread);
 	}
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 }
 
 /*!\internal
@@ -3831,14 +3831,14 @@ void tqThreadTerminationHandlerRecursive( TQObject* object, TQThread* originThre
   for thread destruction.
  */
 void TQApplication::threadTerminationHandler( TQThread *originThread ) {
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 	TQMutexLocker locker( tqt_mutex );
 	TQThread* destinationThread = guiThread();
 	const TQObjectList* objects = TQObject::objectTrees();
 	for ( TQObjectListIt objectit( *objects ) ; *objectit; ++objectit ) {
 		tqThreadTerminationHandlerRecursive((*objectit), originThread, destinationThread);
 	}
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 }
 
 /*!\internal
@@ -4190,7 +4190,7 @@ bool TQApplication::desktopSettingsAware()
   \sa lock(), unlock() \link threads.html Thread Support in TQt\endlink
 */
 
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 void TQApplication::lock()
 {
     tqt_mutex->lock();
diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp
index 84dcefb2..8e859349 100644
--- a/src/kernel/qapplication_x11.cpp
+++ b/src/kernel/qapplication_x11.cpp
@@ -97,7 +97,7 @@
 #endif // QT_NO_IM
 #include "qinternal_p.h" // shared double buffer cleanup
 
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 # include "ntqthread.h"
 #endif
 
@@ -1645,7 +1645,7 @@ void tqt_init_internal( int *argcptr, char **argv,
     setlocale( LC_ALL, "" );		// use correct char set mapping
     setlocale( LC_NUMERIC, "C" );	// make sprintf()/scanf() work
 
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     if (( tqt_is_gui_used ) && ( !display )) {
 	// If TQt is running standalone with a GUI, initialize X11 threading
 	XInitThreads();
@@ -2210,7 +2210,7 @@ void tqt_init_internal( int *argcptr, char **argv,
 	TQPainter::initialize();
     }
 
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     TQThread::initialize();
 #endif
 
@@ -2498,7 +2498,7 @@ void tqt_cleanup()
 	TQColor::cleanup();
 	TQSharedDoubleBuffer::cleanup();
     }
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     TQThread::cleanup();
 #endif
 
diff --git a/src/kernel/qeventloop.cpp b/src/kernel/qeventloop.cpp
index 985f3b3b..94018fa5 100644
--- a/src/kernel/qeventloop.cpp
+++ b/src/kernel/qeventloop.cpp
@@ -41,7 +41,7 @@
 #include "ntqapplication.h"
 #include "ntqdatetime.h"
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #  include "ntqthread.h"
 #  include "private/qthreadinstance_p.h"
 #endif
@@ -116,7 +116,7 @@ TQEventLoop::TQEventLoop( TQObject *parent, const char *name )
 
     init();
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
     TQThread* thread = TQThread::currentThreadObject();
     if (thread) {
         if (thread->d) {
@@ -135,7 +135,7 @@ TQEventLoop::~TQEventLoop()
 {
     cleanup();
     delete d;
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
     TQThread* thread = TQThread::currentThreadObject();
     if (thread) {
         if (thread->d) {
diff --git a/src/kernel/qeventloop_unix_glib.cpp b/src/kernel/qeventloop_unix_glib.cpp
index ceacd81b..51c560a7 100644
--- a/src/kernel/qeventloop_unix_glib.cpp
+++ b/src/kernel/qeventloop_unix_glib.cpp
@@ -46,7 +46,7 @@
 #include "ntqbitarray.h"
 #include "ntqmutex.h"
 
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
   #include "ntqthread.h"
 #endif
 
@@ -55,11 +55,11 @@
 
 #include <glib.h>
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #ifdef QT_USE_GLIBMAINLOOP
 extern TQMutex *tqt_timerListMutex;
 #endif // QT_USE_GLIBMAINLOOP
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
 /*****************************************************************************
   Timer handling; UNIX has no application timer support so we'll have to
@@ -186,7 +186,7 @@ static int allocTimerId()			// find avail timer identifier
 
 static void insertTimer( const TimerInfo *ti )				// insert timer info into list
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	tqt_timerListMutex->lock();
 #endif
 	TimerInfo *t = timerList->first();
@@ -209,7 +209,7 @@ static void insertTimer( const TimerInfo *ti )				// insert timer info into list
 		tqDebug( "TQObject: %d timers now exist for object %s::%s", dangerCount, ti->obj->className(), ti->obj->name() );
 	}
 #endif
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	tqt_timerListMutex->unlock();
 #endif
 }
@@ -235,7 +235,7 @@ static inline void getTime( timeval &t )				// get time of day
 
 static void repairTimer( const timeval &time )				// repair broken timer
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	tqt_timerListMutex->lock();
 #endif
 	timeval diff = watchtime - time;
@@ -244,7 +244,7 @@ static void repairTimer( const timeval &time )				// repair broken timer
 		t->timeout = t->timeout - diff;
 		t = timerList->next();
 	}
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	tqt_timerListMutex->unlock();
 #endif
 }
@@ -262,7 +262,7 @@ static void repairTimer( const timeval &time )				// repair broken timer
 
 timeval *qt_wait_timer()
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	tqt_timerListMutex->lock();
 #endif
 	static timeval tm;
@@ -288,19 +288,19 @@ timeval *qt_wait_timer()
 		if ( qt_wait_timer_max && *qt_wait_timer_max < tm ) {
 			tm = *qt_wait_timer_max;
 		}
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 		tqt_timerListMutex->unlock();
 #endif
 		return &tm;
 	}
 	if ( qt_wait_timer_max ) {
 		tm = *qt_wait_timer_max;
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 		tqt_timerListMutex->unlock();
 #endif
 		return &tm;
 	}
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	tqt_timerListMutex->unlock();
 #endif
 	return 0;							// no timers
@@ -316,7 +316,7 @@ static void initTimers()						// initialize timers
 		timerBitVec->clearBit( i );
 	}
 	timerList = new TimerList;
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	tqt_timerListMutex = new TQMutex(true);
 #endif
 	TQ_CHECK_PTR( timerList );
@@ -336,18 +336,18 @@ void cleanupTimers()
 // Main timer functions for starting and killing timers
 int qStartTimer( int interval, TQObject *obj )
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	if (tqt_timerListMutex) tqt_timerListMutex->lock();
 #endif
 	if ( !timerList ) {						// initialize timer data
 		initTimers();
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 		if (tqt_timerListMutex) tqt_timerListMutex->lock();
 #endif
 	}
 	int id = allocTimerId();					// get free timer id
 	if ( (id <= 0) || (id > (int)timerBitVec->size()) || (!obj) ) {	// cannot create timer
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 		if (tqt_timerListMutex) tqt_timerListMutex->unlock();
 #endif
 		return 0;
@@ -363,7 +363,7 @@ int qStartTimer( int interval, TQObject *obj )
 	t->timeout = currentTime + t->interval;
 	t->obj = obj;
 	insertTimer( t );						// put timer in list
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	if (tqt_timerListMutex) tqt_timerListMutex->unlock();
 #endif
 	return id;
@@ -371,12 +371,12 @@ int qStartTimer( int interval, TQObject *obj )
 
 bool qKillTimer( int id )
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	if (tqt_timerListMutex) tqt_timerListMutex->lock();
 #endif
 	register TimerInfo *t;
 	if ( (!timerList) || (id <= 0) || (id > (int)timerBitVec->size()) || (!timerBitVec->testBit( id-1 )) ) {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 		if (tqt_timerListMutex) tqt_timerListMutex->unlock();
 #endif
 		return FALSE;						// not init'd or invalid timer
@@ -389,13 +389,13 @@ bool qKillTimer( int id )
 		bool ret;
 		timerBitVec->clearBit( id-1 );				// set timer inactive
 		ret = timerList->remove();
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 		if (tqt_timerListMutex) tqt_timerListMutex->unlock();
 #endif
 		return ret;
 	}
 	else {								// id not found
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 		if (tqt_timerListMutex) tqt_timerListMutex->unlock();
 #endif
 		return FALSE;
@@ -404,12 +404,12 @@ bool qKillTimer( int id )
 
 bool qKillTimer( TQObject *obj )
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	if (tqt_timerListMutex) tqt_timerListMutex->lock();
 #endif
 	register TimerInfo *t;
 	if ( !timerList ) {						// not initialized
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 		if (tqt_timerListMutex) tqt_timerListMutex->unlock();
 #endif
 		return FALSE;
@@ -425,7 +425,7 @@ bool qKillTimer( TQObject *obj )
 			t = timerList->next();
 		}
 	}
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	if (tqt_timerListMutex) tqt_timerListMutex->unlock();
 #endif
 	return TRUE;
@@ -632,11 +632,11 @@ int TQEventLoop::timeToWait() const
 
 int TQEventLoop::activateTimers()
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	if (tqt_timerListMutex) tqt_timerListMutex->lock();
 #endif
 	if ( !timerList || !timerList->count() ) {		// no timers
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 		if (tqt_timerListMutex) tqt_timerListMutex->unlock();
 #endif
 		return 0;
@@ -682,11 +682,11 @@ int TQEventLoop::activateTimers()
 		if ( t->interval.tv_usec > 0 || t->interval.tv_sec > 0 ) {
 			n_act++;
 		}
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 		if (tqt_timerListMutex) tqt_timerListMutex->unlock();
 #endif
 		TQTimerEvent e( t->id );
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 		// Be careful...the current thread may not be the target object's thread!
 		if ((!t->obj) || 
 		    (TQThread::currentThreadObject() && TQThread::currentThreadObject()->threadPostedEventsDisabled()) ||
@@ -696,17 +696,17 @@ int TQEventLoop::activateTimers()
 		else {
 			TQApplication::postEvent( t->obj, new TQTimerEvent(e) );	// post event to correct thread
 		}
-#else // defined(QT_THREAD_SUPPORT)
+#else // defined(TQT_THREAD_SUPPORT)
 		TQApplication::sendEvent( t->obj, &e );					// send event
-#endif // defined(QT_THREAD_SUPPORT)
-#if defined(QT_THREAD_SUPPORT)
+#endif // defined(TQT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 		if (tqt_timerListMutex) tqt_timerListMutex->lock();
 #endif
 		if ( timerList->findRef( begin ) == -1 ) {
 			begin = 0;
 		}
 	}
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	if (tqt_timerListMutex) tqt_timerListMutex->unlock();
 #endif
 	return n_act;
@@ -731,7 +731,7 @@ int TQEventLoop::activateSocketNotifiers()
 		printf("activate sn  : send event fd=%d\n", sn->gPollFD.fd );
 #endif	
 		sn->pending = FALSE;
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 		// Be careful...the current thread may not be the target object's thread!
 		if ((!sn->obj) || 
 		    (TQThread::currentThreadObject() && TQThread::currentThreadObject()->threadPostedEventsDisabled()) ||
@@ -741,9 +741,9 @@ int TQEventLoop::activateSocketNotifiers()
 		else {
 			TQApplication::postEvent( sn->obj, new TQEvent(event) );	// post event to correct thread
 		}
-#else // defined(QT_THREAD_SUPPORT)
+#else // defined(TQT_THREAD_SUPPORT)
 		TQApplication::sendEvent( sn->obj, &event );				// send event
-#endif // defined(QT_THREAD_SUPPORT)
+#endif // defined(TQT_THREAD_SUPPORT)
 		n_act++;
 	}
     }
diff --git a/src/kernel/qeventloop_x11.cpp b/src/kernel/qeventloop_x11.cpp
index c63a491e..1ba3b21d 100644
--- a/src/kernel/qeventloop_x11.cpp
+++ b/src/kernel/qeventloop_x11.cpp
@@ -43,9 +43,9 @@
 #include "qcolor_p.h"
 #include "qt_x11_p.h"
 
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 #  include "ntqmutex.h"
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
 #include <errno.h>
 
@@ -138,7 +138,7 @@ bool TQEventLoop::processEvents( ProcessEventsFlags flags )
     XEvent event;
     int	   nevents = 0;
 
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     TQMutexLocker locker( TQApplication::tqt_mutex );
 #endif
 
@@ -283,7 +283,7 @@ bool TQEventLoop::processEvents( ProcessEventsFlags flags )
 
     // unlock the GUI mutex and select.  when we return from this function, there is
     // something for us to do
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     if ( locker.mutex() ) locker.mutex()->unlock();
     else return false;
 #endif
@@ -298,7 +298,7 @@ bool TQEventLoop::processEvents( ProcessEventsFlags flags )
     } while (nsel == -1 && (errno == EINTR || errno == EAGAIN));
 
     // relock the GUI mutex before processing any pending events
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     if ( locker.mutex() ) locker.mutex()->lock();
     else return false;
 #endif
diff --git a/src/kernel/qeventloop_x11_glib.cpp b/src/kernel/qeventloop_x11_glib.cpp
index df607ce7..4b44fe8f 100644
--- a/src/kernel/qeventloop_x11_glib.cpp
+++ b/src/kernel/qeventloop_x11_glib.cpp
@@ -46,10 +46,10 @@
 #include "qcolor_p.h"
 #include "qt_x11_p.h"
 
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 #  include "ntqmutex.h"
 #  include "ntqthread.h"
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
 #include <errno.h>
 
@@ -295,7 +295,7 @@ bool TQEventLoop::processX11Events()
 	XEvent event;
 	int nevents = 0;
 
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	TQMutexLocker locker( TQApplication::tqt_mutex );
 #endif
 
@@ -383,7 +383,7 @@ bool TQEventLoop::gsourcePrepare(GSource *gs, int * timeout)
 
 	ProcessEventsFlags flags = d->pev_flags;
 
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	TQMutexLocker locker( TQApplication::tqt_mutex );
 #endif
 
@@ -535,10 +535,10 @@ bool TQEventLoop::gsourceDispatch(GSource *gs) {
 	Q_UNUSED(gs);
 
 	// relock the GUI mutex before processing any pending events
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	TQMutexLocker locker( TQApplication::tqt_mutex );
 #endif
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	if (locker.mutex()) locker.mutex()->lock();
 #endif
 
@@ -608,13 +608,13 @@ bool TQEventLoop::gsourceDispatch(GSource *gs) {
 		// color approx. optimization - only on X11
 		qt_reset_color_avail();
 
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 		if (locker.mutex()) locker.mutex()->unlock();
 #endif
 		processX11Events();
 	}
 	else {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 		if (locker.mutex()) locker.mutex()->unlock();
 #endif
 	}
@@ -629,9 +629,9 @@ bool TQEventLoop::gsourceDispatch(GSource *gs) {
 
 bool TQEventLoop::hasPendingEvents() const
 {
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 	TQMutexLocker locker( TQApplication::tqt_mutex );
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
 	extern uint qGlobalPostedEventsCount(); // from qapplication.cpp
 	return ( qGlobalPostedEventsCount() || ( (tqt_is_gui_used && TQApplication::isGuiThread())  ? XPending( TQPaintDevice::x11AppDisplay() ) : 0));
diff --git a/src/kernel/qfont_x11.cpp b/src/kernel/qfont_x11.cpp
index 9baa6a5c..6877c9a6 100644
--- a/src/kernel/qfont_x11.cpp
+++ b/src/kernel/qfont_x11.cpp
@@ -269,13 +269,13 @@ void TQFont::initialize()
     TQString sample;
 
     if ( ttmp != -1 ) {
-#if defined(QT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS)
+#if defined(TQT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS)
 	// use the reentrant versions of localtime() where available
 	tm res;
 	tt = localtime_r( &ttmp, &res );
 #else
 	tt = localtime( &ttmp );
-#endif // QT_THREAD_SUPPORT && _POSIX_THREAD_SAFE_FUNCTIONS
+#endif // TQT_THREAD_SUPPORT && _POSIX_THREAD_SAFE_FUNCTIONS
 
 	if ( tt != 0 && strftime( samp, 64, "%A%B", tt ) > 0 )
 	    if ( codec )
diff --git a/src/kernel/qmetaobject.cpp b/src/kernel/qmetaobject.cpp
index df59af7f..90a8efa4 100644
--- a/src/kernel/qmetaobject.cpp
+++ b/src/kernel/qmetaobject.cpp
@@ -41,9 +41,9 @@
 #include "ntqmetaobject.h"
 #include "ntqasciidict.h"
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include <private/qmutexpool_p.h>
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
 /*!
   \class TQMetaData ntqmetaobject.h
@@ -282,10 +282,10 @@ TQMetaObject::~TQMetaObject()
     delete slotDict;				// delete dicts
     delete signalDict;
     delete d;
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
     TQMutexLocker( tqt_global_mutexpool ?
 		  tqt_global_mutexpool->get( &qt_metaobjects ) : 0 );
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
     if ( qt_metaobjects ) {
 	qt_metaobjects->remove( classname );
 	if ( qt_metaobjects->isEmpty() ) {
@@ -799,10 +799,10 @@ TQMetaObject *TQMetaObject::metaObject( const char *class_name )
 {
     if ( !qt_metaobjects )
 	return 0;
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
     TQMutexLocker( tqt_global_mutexpool ?
 		  tqt_global_mutexpool->get( &qt_metaobjects ) : 0 );
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
     TQtStaticMetaObjectFunction func = (TQtStaticMetaObjectFunction)qt_metaobjects->find( class_name );
     if ( func )
 	return func();
@@ -814,10 +814,10 @@ bool TQMetaObject::hasMetaObject( const char *class_name )
 {
     if ( !qt_metaobjects )
 	return FALSE;
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
     TQMutexLocker( tqt_global_mutexpool ?
 		  tqt_global_mutexpool->get( &qt_metaobjects ) : 0 );
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
     return !!qt_metaobjects->find( class_name );
 }
 
@@ -1204,10 +1204,10 @@ bool TQMetaProperty::reset( TQObject* o ) const
 TQMetaObjectCleanUp::TQMetaObjectCleanUp( const char *mo_name, TQtStaticMetaObjectFunction func )
     : metaObject( 0 )
 {
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
     TQMutexLocker( tqt_global_mutexpool ?
 		  tqt_global_mutexpool->get( &qt_metaobjects ) : 0 );
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
     if ( !qt_metaobjects )
 	qt_metaobjects = new TQAsciiDict<void>( 257 );
     qt_metaobjects->insert( mo_name, (void*)func );
@@ -1226,10 +1226,10 @@ TQMetaObjectCleanUp::TQMetaObjectCleanUp()
 
 TQMetaObjectCleanUp::~TQMetaObjectCleanUp()
 {
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
     TQMutexLocker( tqt_global_mutexpool ?
 		  tqt_global_mutexpool->get( &qt_metaobjects ) : 0 );
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
     if ( !--qt_metaobjects_count ) {
 	delete qt_metaobjects;
 	qt_metaobjects = 0;
diff --git a/src/kernel/qobject.cpp b/src/kernel/qobject.cpp
index 665aead2..7156df6b 100644
--- a/src/kernel/qobject.cpp
+++ b/src/kernel/qobject.cpp
@@ -52,7 +52,7 @@
 // TQStyleControlElementData
 #include "ntqstyle.h"
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include "ntqmutex.h"
 #include <private/qmutexpool_p.h>
 #include "ntqthread.h"
@@ -130,16 +130,16 @@ TQStyleControlElementDataPrivate* TQObject::controlElementDataPrivateObject() {
 	return d->controlElementDataPrivate;
 }
 
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 
 void TQObject::moveToThread_helper(TQThread *targetThread)
 {
     TQEvent e(TQEvent::ThreadChange);
     TQApplication::sendEvent(this, &e);
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
     TQMutexLocker locker( d->childObjectListMutex );
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
     if (childObjects) {
         TQObject *child;
@@ -155,9 +155,9 @@ void TQObject::setThreadObject_helper(TQThread *targetThread)
 {
     d->ownThread = targetThread;
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
     TQMutexLocker locker( d->childObjectListMutex );
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
     if (childObjects) {
         TQObject *child;
@@ -185,9 +185,9 @@ void TQObject::setThreadObject_helper(TQThread *targetThread)
  */
 void TQObject::moveToThread(TQThread *targetThread)
 {
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
     TQMutexLocker locker( TQApplication::tqt_mutex );
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
     if (parentObj) {
 #if defined(QT_DEBUG)
@@ -491,7 +491,7 @@ void *tqt_find_obj_child( TQObject *parent, const char *type, const char *name )
     return 0;
 }
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 
 /*!
     Returns a pointer to the TQThread* associated with
@@ -530,12 +530,12 @@ static void qt_spy_signal( TQObject* sender, int signal, TQUObject* o )
 	s.sprintf( "%s_%s", mo->className(), sigData->name );
 	int slot = tqt_preliminary_signal_spy->metaObject()->findSlot( s, TRUE );
 	if ( slot >= 0 ) {
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 	    // protect access to qt_spy_signal_sender
 	    void * const address = &qt_spy_signal_sender;
 	    TQMutexLocker locker( tqt_global_mutexpool ?
 				 tqt_global_mutexpool->get( address ) : 0 );
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
 	    TQObject* old_sender = qt_spy_signal_sender;
 	    qt_spy_signal_sender = sender;
@@ -554,7 +554,7 @@ static void qt_spy_signal( TQObject* sender, int signal, TQUObject* o )
 
 static TQObjectList* object_trees = 0;
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 static TQMutex *obj_trees_mutex = 0;
 #endif
 
@@ -562,7 +562,7 @@ static void cleanup_object_trees()
 {
     delete object_trees;
     object_trees = 0;
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
     delete obj_trees_mutex;
     obj_trees_mutex = 0;
 #endif
@@ -576,7 +576,7 @@ static void ensure_object_trees()
 
 static void insert_tree( TQObject* obj )
 {
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
     if ( !obj_trees_mutex )
 	obj_trees_mutex = new TQMutex();
     TQMutexLocker locker( obj_trees_mutex );
@@ -589,7 +589,7 @@ static void insert_tree( TQObject* obj )
 static void remove_tree( TQObject* obj )
 {
     if ( object_trees ) {
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 	TQMutexLocker locker( obj_trees_mutex );
 #endif
 	object_trees->removeRef( obj );
@@ -780,10 +780,10 @@ TQObject::~TQObject()
 	delete childObjects;
     }
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
     delete d->childObjectListMutex;
     delete d->senderObjectListMutex;
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
     delete d;
 }
@@ -1079,17 +1079,17 @@ bool TQObject::event( TQEvent *e )
 		    TQSenderObjectList* sol;
 		    TQObject* oldSender = 0;
 		    sol = senderObjects;
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 		    sol->listMutex->lock();
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 		    if ( sol ) {
 			oldSender = sol->currentSender;
 			sol->ref();
 			sol->currentSender = metaEvent->sender();
 		    }
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 		    sol->listMutex->unlock();
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 		    TQUObject *o = metaEvent->data();
 		    if (metaEvent->type() == TQMetaCallEvent::MetaCallEmit) {
 			tqt_emit( metaEvent->id(), o );
@@ -1097,9 +1097,9 @@ bool TQObject::event( TQEvent *e )
 		    if (metaEvent->type() == TQMetaCallEvent::MetaCallInvoke) {
 			tqt_invoke( metaEvent->id(), o );
 		    }
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 		    sol->listMutex->lock();
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 		    if (sol ) {
 			sol->currentSender = oldSender;
 			if ( sol->deref() ) {
@@ -1108,9 +1108,9 @@ bool TQObject::event( TQEvent *e )
 			    sol = NULL;
 			}
 		    }
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 		    if (sol) sol->listMutex->unlock();
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 		}
 		else {
 		    tqWarning("TQObject: Ignoring metacall event from non-owning thread");
@@ -1617,9 +1617,9 @@ TQConnectionList *TQObject::receivers( int signal ) const
 
 void TQObject::insertChild( TQObject *obj )
 {
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 	TQMutexLocker locker( d->childObjectListMutex );
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
     if ( obj->isTree ) {
 	remove_tree( obj );
@@ -1663,9 +1663,9 @@ void TQObject::insertChild( TQObject *obj )
 
 void TQObject::removeChild( TQObject *obj )
 {
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 	TQMutexLocker locker( d->childObjectListMutex );
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
     if ( childObjects && childObjects->removeRef(obj) ) {
 	obj->parentObj = 0;
@@ -1903,12 +1903,12 @@ const TQObject *TQObject::sender()
 {
 #ifndef QT_NO_PRELIMINARY_SIGNAL_SPY
     if ( this == tqt_preliminary_signal_spy ) {
-#  ifdef QT_THREAD_SUPPORT
+#  ifdef TQT_THREAD_SUPPORT
 	// protect access to qt_spy_signal_sender
 	void * const address = &qt_spy_signal_sender;
 	TQMutexLocker locker( tqt_global_mutexpool ?
 			     tqt_global_mutexpool->get( address ) : 0 );
-#  endif // QT_THREAD_SUPPORT
+#  endif // TQT_THREAD_SUPPORT
 	return qt_spy_signal_sender;
     }
 #endif
@@ -2252,24 +2252,24 @@ void TQObject::connectInternal( const TQObject *sender, int signal_index, const
     TQ_CHECK_PTR( c );
     clist->append( c );
     if ( !r->senderObjects ) {			// create list of senders
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 	r->d->senderObjectListMutex->lock();
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 	r->senderObjects = new TQSenderObjectList;
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 	r->senderObjects->listMutex->lock();
 	r->d->senderObjectListMutex->unlock();
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
     }
     else {
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 	r->senderObjects->listMutex->lock();
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
     }
     r->senderObjects->append( s );		// add sender to list
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
     r->senderObjects->listMutex->unlock();
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 }
 
 
@@ -2475,25 +2475,25 @@ bool TQObject::disconnectInternal( const TQObject *sender, int signal_index,
 	    c = clist->first();
 	    while ( c ) {			// for all receivers...
 		if ( r == 0 ) {			// remove all receivers
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 		    if (c->object()->senderObjects) c->object()->senderObjects->listMutex->lock();
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 		    removeObjFromList( c->object()->senderObjects, s );
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 		    if (c->object()->senderObjects) c->object()->senderObjects->listMutex->unlock();
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 		    success = TRUE;
 		    c = clist->next();
 		} else if ( r == c->object() &&
 			    ( (member_index == -1) ||
 			      ((member_index == c->member()) && (c->memberType() == membcode)) ) ) {
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 		    if (c->object()->senderObjects) c->object()->senderObjects->listMutex->lock();
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 		    removeObjFromList( c->object()->senderObjects, s, TRUE );
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 		    if (c->object()->senderObjects) c->object()->senderObjects->listMutex->unlock();
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 		    success = TRUE;
 		    clist->remove();
 		    c = clist->current();
@@ -2512,25 +2512,25 @@ bool TQObject::disconnectInternal( const TQObject *sender, int signal_index,
 	c = clist->first();
 	while ( c ) {				// for all receivers...
 	    if ( r == 0 ) {			// remove all receivers
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 		    if (c->object()->senderObjects) c->object()->senderObjects->listMutex->lock();
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 		removeObjFromList( c->object()->senderObjects, s, TRUE );
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 		    if (c->object()->senderObjects) c->object()->senderObjects->listMutex->unlock();
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 		success = TRUE;
 		c = clist->next();
 	    } else if ( r == c->object() &&
 			( (member_index == -1) ||
 			  ((member_index == c->member()) && (c->memberType() == membcode)) ) ) {
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 		    if (c->object()->senderObjects) c->object()->senderObjects->listMutex->lock();
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 		removeObjFromList( c->object()->senderObjects, s, TRUE );
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 		    if (c->object()->senderObjects) c->object()->senderObjects->listMutex->unlock();
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 		success = TRUE;
 		clist->remove();
 		c = clist->current();
@@ -2772,9 +2772,9 @@ void TQObject::activate_signal( TQConnectionList *clist, TQUObject *o )
 	c = clist->first();
 	object = c->object();
 	sol = object->senderObjects;
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 	sol->listMutex->lock();
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 	if ( sol ) {
 	    oldSender = sol->currentSender;
 	    sol->ref();
@@ -2785,13 +2785,13 @@ void TQObject::activate_signal( TQConnectionList *clist, TQUObject *o )
 	        (object->d->disableThreadPostedEvents) || 
 	        (currentThread && currentThread->threadPostedEventsDisabled()) || 
 	        (currentThread && object->d->ownThread == currentThread)) {
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 		sol->listMutex->unlock();
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 		object->tqt_emit( c->member(), o );
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 		sol->listMutex->lock();
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 	    }
 	    else {
 		if (object->d->ownThread && !object->d->ownThread->finished()) {
@@ -2807,13 +2807,13 @@ void TQObject::activate_signal( TQConnectionList *clist, TQUObject *o )
 	        (object->d->disableThreadPostedEvents) || 
 	        (currentThread && currentThread->threadPostedEventsDisabled()) || 
 	        (currentThread && object->d->ownThread == currentThread)) {
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 		sol->listMutex->unlock();
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 		object->tqt_invoke( c->member(), o );
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 		sol->listMutex->lock();
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 	    }
 	    else {
 		if (object->d->ownThread && !object->d->ownThread->finished()) {
@@ -2832,9 +2832,9 @@ void TQObject::activate_signal( TQConnectionList *clist, TQUObject *o )
 		sol = NULL;
 	    }
 	}
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 	if (sol) sol->listMutex->unlock();
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
     } else {
 	TQConnection *cd = 0;
 	TQConnectionListIt it(*clist);
@@ -2845,9 +2845,9 @@ void TQObject::activate_signal( TQConnectionList *clist, TQUObject *o )
 	    cd = c;
 	    object = c->object();
 	    sol = object->senderObjects;
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 	sol->listMutex->lock();
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 	    if ( sol ) {
 		oldSender = sol->currentSender;
 		sol->ref();
@@ -2858,13 +2858,13 @@ void TQObject::activate_signal( TQConnectionList *clist, TQUObject *o )
 		    (object->d->disableThreadPostedEvents) || 
 		    (currentThread && currentThread->threadPostedEventsDisabled()) || 
 		    (currentThread && object->d->ownThread == currentThread)) {
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 		    sol->listMutex->unlock();
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 		    object->tqt_emit( c->member(), o );
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 		    sol->listMutex->lock();
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 		}
 		else {
 		    if (object->d->ownThread && !object->d->ownThread->finished()) {
@@ -2880,13 +2880,13 @@ void TQObject::activate_signal( TQConnectionList *clist, TQUObject *o )
 		    (object->d->disableThreadPostedEvents) || 
 		    (currentThread && currentThread->threadPostedEventsDisabled()) || 
 		    (currentThread && object->d->ownThread == currentThread)) {
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 		    sol->listMutex->unlock();
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 		    object->tqt_invoke( c->member(), o );
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 		    sol->listMutex->lock();
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 		}
 		else {
 		    if (object->d->ownThread && !object->d->ownThread->finished()) {
@@ -2905,9 +2905,9 @@ void TQObject::activate_signal( TQConnectionList *clist, TQUObject *o )
 		    sol = NULL;
 		}
 	    }
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 	    if (sol) sol->listMutex->unlock();
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 	}
     }
 }
@@ -3046,9 +3046,9 @@ void TQObject::dumpObjectTree()
 
 void TQObject::dumpObjectInfo()
 {
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
     TQMutexLocker locker( d->senderObjectListMutex );
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
 #if defined(QT_DEBUG)
     tqDebug( "OBJECT %s::%s", className(), name( "unnamed" ) );
diff --git a/src/kernel/qthread.cpp b/src/kernel/qthread.cpp
index 86accebb..d6cd01f6 100644
--- a/src/kernel/qthread.cpp
+++ b/src/kernel/qthread.cpp
@@ -36,7 +36,7 @@
 **
 **********************************************************************/
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 
 #include "qplatformdefs.h"
 
@@ -132,9 +132,9 @@
 
 TQThread::TQThread()
 {
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
     TQMutexLocker locker( TQApplication::tqt_mutex );
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
     d = new TQThreadInstance;
     d->init(0);
@@ -282,4 +282,4 @@ void TQEventLoopThread::run()
     if (eventLoop) eventLoop->exec();
 }
 
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
diff --git a/src/kernel/qthread_unix.cpp b/src/kernel/qthread_unix.cpp
index c0f02464..5a6ad877 100644
--- a/src/kernel/qthread_unix.cpp
+++ b/src/kernel/qthread_unix.cpp
@@ -36,7 +36,7 @@
 **
 **********************************************************************/
 
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 
 #include "qplatformdefs.h"
 
@@ -557,4 +557,4 @@ TQThread *TQThread::currentThreadObject()
 }
 
 
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
diff --git a/src/kernel/qwidget.cpp b/src/kernel/qwidget.cpp
index e37fa303..b3a630bc 100644
--- a/src/kernel/qwidget.cpp
+++ b/src/kernel/qwidget.cpp
@@ -56,7 +56,7 @@
 #include "ntqstyle.h"
 #include "ntqmetaobject.h"
 #include "ntqguardedptr.h"
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 #include "ntqthread.h"
 #endif
 #if defined(QT_ACCESSIBILITY_SUPPORT)
@@ -890,7 +890,7 @@ TQWidget::TQWidget( TQWidget *parent, const char *name, WFlags f, NFlags n )
     }
 #endif
 
-#if defined(QT_THREAD_SUPPORT) && defined(QT_CHECK_STATE)
+#if defined(TQT_THREAD_SUPPORT) && defined(QT_CHECK_STATE)
     if (TQThread::currentThreadObject() != TQApplication::guiThread()) {
 	tqFatal( "TQWidget: Cannot create a TQWidget outside of the main GUI thread" );
     }
diff --git a/src/moc/moc.y b/src/moc/moc.y
index b10e444e..e7554605 100644
--- a/src/moc/moc.y
+++ b/src/moc/moc.y
@@ -2987,8 +2987,8 @@ void generateClass()		      // generate C++ source code for a class
 //
     fprintf( out, "TQMetaObject* %s::staticMetaObject()\n{\n", (const char*)qualifiedClassName() );
     fprintf( out, "    if ( metaObj ) {\n\treturn metaObj;\n}\n" );
-    fprintf( out, "#ifdef QT_THREAD_SUPPORT\n    if (tqt_sharedMetaObjectMutex) tqt_sharedMetaObjectMutex->lock();\n" );
-    fprintf( out, "    if ( metaObj ) {\n\tif (tqt_sharedMetaObjectMutex) tqt_sharedMetaObjectMutex->unlock();\n\treturn metaObj;\n    }\n#endif // QT_THREAD_SUPPORT\n" );
+    fprintf( out, "#ifdef TQT_THREAD_SUPPORT\n    if (tqt_sharedMetaObjectMutex) tqt_sharedMetaObjectMutex->lock();\n" );
+    fprintf( out, "    if ( metaObj ) {\n\tif (tqt_sharedMetaObjectMutex) tqt_sharedMetaObjectMutex->unlock();\n\treturn metaObj;\n    }\n#endif // TQT_THREAD_SUPPORT\n" );
     if ( isTQObject )
 	fprintf( out, "    TQMetaObject* parentObject = staticTQtMetaObject();\n" );
     else if ( !g->superClassName.isEmpty() )
@@ -3058,7 +3058,7 @@ void generateClass()		      // generate C++ source code for a class
 // Setup cleanup handler and return meta object
 //
     fprintf( out, "    cleanUp_%s.setMetaObject( metaObj );\n", cleanup.data() );
-    fprintf( out, "#ifdef QT_THREAD_SUPPORT\n    if (tqt_sharedMetaObjectMutex) tqt_sharedMetaObjectMutex->unlock();\n#endif // QT_THREAD_SUPPORT\n" );
+    fprintf( out, "#ifdef TQT_THREAD_SUPPORT\n    if (tqt_sharedMetaObjectMutex) tqt_sharedMetaObjectMutex->unlock();\n#endif // TQT_THREAD_SUPPORT\n" );
     fprintf( out, "    return metaObj;\n}\n" );
 
 //
diff --git a/src/moc/moc_yacc.cpp b/src/moc/moc_yacc.cpp
index 5a8be928..abeab2d7 100644
--- a/src/moc/moc_yacc.cpp
+++ b/src/moc/moc_yacc.cpp
@@ -5862,8 +5862,8 @@ void generateClass()		      // generate C++ source code for a class
 //
     fprintf( out, "TQMetaObject* %s::staticMetaObject()\n{\n", (const char*)qualifiedClassName() );
     fprintf( out, "    if ( metaObj ) {\n\treturn metaObj;\n}\n" );
-    fprintf( out, "#ifdef QT_THREAD_SUPPORT\n    if (tqt_sharedMetaObjectMutex) tqt_sharedMetaObjectMutex->lock();\n" );
-    fprintf( out, "    if ( metaObj ) {\n\tif (tqt_sharedMetaObjectMutex) tqt_sharedMetaObjectMutex->unlock();\n\treturn metaObj;\n    }\n#endif // QT_THREAD_SUPPORT\n" );
+    fprintf( out, "#ifdef TQT_THREAD_SUPPORT\n    if (tqt_sharedMetaObjectMutex) tqt_sharedMetaObjectMutex->lock();\n" );
+    fprintf( out, "    if ( metaObj ) {\n\tif (tqt_sharedMetaObjectMutex) tqt_sharedMetaObjectMutex->unlock();\n\treturn metaObj;\n    }\n#endif // TQT_THREAD_SUPPORT\n" );
     if ( isTQObject )
 	fprintf( out, "    TQMetaObject* parentObject = staticTQtMetaObject();\n" );
     else if ( !g->superClassName.isEmpty() )
@@ -5933,7 +5933,7 @@ void generateClass()		      // generate C++ source code for a class
 // Setup cleanup handler and return meta object
 //
     fprintf( out, "    cleanUp_%s.setMetaObject( metaObj );\n", cleanup.data() );
-    fprintf( out, "#ifdef QT_THREAD_SUPPORT\n    if (tqt_sharedMetaObjectMutex) tqt_sharedMetaObjectMutex->unlock();\n#endif // QT_THREAD_SUPPORT\n" );
+    fprintf( out, "#ifdef TQT_THREAD_SUPPORT\n    if (tqt_sharedMetaObjectMutex) tqt_sharedMetaObjectMutex->unlock();\n#endif // TQT_THREAD_SUPPORT\n" );
     fprintf( out, "    return metaObj;\n}\n" );
 
 //
diff --git a/src/qt.pro b/src/qt.pro
index 7bde5587..011c59d6 100644
--- a/src/qt.pro
+++ b/src/qt.pro
@@ -121,7 +121,7 @@ thread {
 	!win32-borland:TARGET = tqt-mt
 	win32-borland:TARGET = qtmt
 	embedded:TARGET = qte-mt
-	DEFINES += QT_THREAD_SUPPORT
+	DEFINES += TQT_THREAD_SUPPORT
 }
 
 !cups:DEFINES += QT_NO_CUPS
diff --git a/src/tools/ntqglist.h b/src/tools/ntqglist.h
index babc9f49..aaa0a4a3 100644
--- a/src/tools/ntqglist.h
+++ b/src/tools/ntqglist.h
@@ -150,7 +150,7 @@ private:
     TQLNode *locate( uint );			// get node at i'th pos
     TQLNode *unlink();				// unlink node
 
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 //     TQMutex* mutex;
 #endif
 
diff --git a/src/tools/ntqmutex.h b/src/tools/ntqmutex.h
index 7b73514d..e23f66fe 100644
--- a/src/tools/ntqmutex.h
+++ b/src/tools/ntqmutex.h
@@ -45,7 +45,7 @@
 #include "ntqglobal.h"
 #endif // QT_H
 
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 
 class TQMutexPrivate;
 
diff --git a/src/tools/ntqsemaphore.h b/src/tools/ntqsemaphore.h
index dc6309d5..3d418e07 100644
--- a/src/tools/ntqsemaphore.h
+++ b/src/tools/ntqsemaphore.h
@@ -45,7 +45,7 @@
 #include "ntqglobal.h"
 #endif // QT_H
 
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 
 class TQSemaphorePrivate;
 
diff --git a/src/tools/ntqthreadstorage.h b/src/tools/ntqthreadstorage.h
index 06edbec3..9d9f20cf 100644
--- a/src/tools/ntqthreadstorage.h
+++ b/src/tools/ntqthreadstorage.h
@@ -39,7 +39,7 @@
 #ifndef TQTHREADSTORAGE_H
 #define TQTHREADSTORAGE_H
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 
 #ifndef QT_H
 #include "ntqglobal.h"
@@ -90,6 +90,6 @@ public:
     { (void) d.set( t ); }
 };
 
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
 #endif // TQTHREADSTORAGE_H
diff --git a/src/tools/ntqwaitcondition.h b/src/tools/ntqwaitcondition.h
index 7b8475f2..b85baf92 100644
--- a/src/tools/ntqwaitcondition.h
+++ b/src/tools/ntqwaitcondition.h
@@ -45,7 +45,7 @@
 #include "ntqglobal.h"
 #endif // QT_H
 
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 
 #include <limits.h>
 
diff --git a/src/tools/qcom_p.h b/src/tools/qcom_p.h
index f3338ca0..afb12285 100644
--- a/src/tools/qcom_p.h
+++ b/src/tools/qcom_p.h
@@ -273,7 +273,7 @@ public:		   \
     ulong release() {if(!--qtrefcount){delete this;return 0;}return qtrefcount;}
 
 #ifndef Q_EXPORT_COMPONENT
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 #define QT_THREADED_BUILD 1
 #define Q_UCM_FLAGS_STRING "11"
 #else
diff --git a/src/tools/qcomlibrary.cpp b/src/tools/qcomlibrary.cpp
index 7097b287..60899a6a 100644
--- a/src/tools/qcomlibrary.cpp
+++ b/src/tools/qcomlibrary.cpp
@@ -48,9 +48,9 @@
 #include <errno.h>
 #endif // NO_ERROR_H
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #  include "qmutexpool_p.h"
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
 #ifndef QT_DEBUG_COMPONENT
 # if defined(QT_DEBUG)
@@ -94,7 +94,7 @@ static bool qt_verify( const TQString& library, uint version, uint flags,
 		    const TQCString &key, bool warn )
 {
     uint our_flags = 1;
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     our_flags |= 2;
 #endif
 
@@ -398,10 +398,10 @@ void TQComLibrary::createInstanceInternal()
     bool query_done = FALSE;
     bool warn_mismatch = TRUE;
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
     TQMutexLocker locker( tqt_global_mutexpool ?
 			 tqt_global_mutexpool->get( &cache ) : 0 );
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
     if ( ! cache ) {
 	cache = new TQSettings;
diff --git a/src/tools/qcriticalsection_p.cpp b/src/tools/qcriticalsection_p.cpp
index 70fcd84e..20c2127b 100644
--- a/src/tools/qcriticalsection_p.cpp
+++ b/src/tools/qcriticalsection_p.cpp
@@ -36,7 +36,7 @@
 **
 **********************************************************************/
 
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 
 #include "qt_windows.h"
 
diff --git a/src/tools/qcriticalsection_p.h b/src/tools/qcriticalsection_p.h
index 8fa38337..6fda0f3a 100644
--- a/src/tools/qcriticalsection_p.h
+++ b/src/tools/qcriticalsection_p.h
@@ -54,7 +54,7 @@
 //
 //
 
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 
 #if defined(Q_WS_WIN)
 
diff --git a/src/tools/qcstring.cpp b/src/tools/qcstring.cpp
index a3bea8ff..6bfaa9c3 100644
--- a/src/tools/qcstring.cpp
+++ b/src/tools/qcstring.cpp
@@ -43,9 +43,9 @@
 #include "ntqregexp.h"
 #include "ntqdatastream.h"
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #  include <private/qmutexpool_p.h>
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
 #include <stdio.h>
 #include <stdarg.h>
@@ -312,10 +312,10 @@ TQ_UINT16 tqChecksum( const char *data, uint len )
 {
     if ( !crc_tbl_init ) {			// create lookup table
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 	TQMutexLocker locker( tqt_global_mutexpool ?
 			     tqt_global_mutexpool->get( &crc_tbl_init ) : 0 );
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
 	if ( !crc_tbl_init ) {
 	    createCRC16Table();
diff --git a/src/tools/qdatetime.cpp b/src/tools/qdatetime.cpp
index 9ab03b6b..235ba745 100644
--- a/src/tools/qdatetime.cpp
+++ b/src/tools/qdatetime.cpp
@@ -1039,7 +1039,7 @@ TQDate TQDate::currentDate( TQt::TimeSpec ts )
     time( &ltime );
     tm *t;
 
-#  if defined(QT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS)
+#  if defined(TQT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS)
     // use the reentrant versions of localtime() and gmtime() where available
     tm res;
     if ( ts == TQt::LocalTime )
@@ -1051,7 +1051,7 @@ TQDate TQDate::currentDate( TQt::TimeSpec ts )
 	t = localtime( &ltime );
     else
 	t = gmtime( &ltime );
-#  endif // QT_THREAD_SUPPORT && _POSIX_THREAD_SAFE_FUNCTIONS
+#  endif // TQT_THREAD_SUPPORT && _POSIX_THREAD_SAFE_FUNCTIONS
 
     d.jd = gregorianToJulian( t->tm_year + 1900, t->tm_mon + 1, t->tm_mday );
 #endif
@@ -1729,7 +1729,7 @@ bool TQTime::currentTime( TQTime *ct, TQt::TimeSpec ts )
     time_t ltime = tv.tv_sec;
     tm *t;
 
-#  if defined(QT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS)
+#  if defined(TQT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS)
     // use the reentrant versions of localtime() and gmtime() where available
     tm res;
     if ( ts == TQt::LocalTime )
@@ -1741,7 +1741,7 @@ bool TQTime::currentTime( TQTime *ct, TQt::TimeSpec ts )
 	t = localtime( &ltime );
     else
 	t = gmtime( &ltime );
-#  endif // QT_THREAD_SUPPORT && _POSIX_THREAD_SAFE_FUNCTIONS
+#  endif // TQT_THREAD_SUPPORT && _POSIX_THREAD_SAFE_FUNCTIONS
 
     ct->ds = (uint)( MSECS_PER_HOUR * t->tm_hour + MSECS_PER_MIN * t->tm_min +
 		     1000 * t->tm_sec + tv.tv_usec / 1000 );
@@ -2042,7 +2042,7 @@ void TQDateTime::setTime_t( time_t secsSince1Jan1970UTC, TQt::TimeSpec ts )
     time_t tmp = secsSince1Jan1970UTC;
     tm *brokenDown = 0;
 
-#if defined(Q_OS_UNIX) && defined(QT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS)
+#if defined(Q_OS_UNIX) && defined(TQT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS)
     // posix compliant system
     // use the reentrant versions of localtime() and gmtime() where available
     tm res;
diff --git a/src/tools/qdir_unix.cpp b/src/tools/qdir_unix.cpp
index 7f316ad7..5c421a3e 100644
--- a/src/tools/qdir_unix.cpp
+++ b/src/tools/qdir_unix.cpp
@@ -48,9 +48,9 @@
 #include "ntqregexp.h"
 #include "ntqstringlist.h"
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #  include <private/qmutexpool_p.h>
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
 #include <stdlib.h>
 #include <limits.h>
@@ -237,7 +237,7 @@ bool TQDir::readDirEntries( const TQString &nameFilter,
     if ( !dir )
 	return FALSE; // cannot read the directory
 
-#if defined(QT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_CYGWIN)
+#if defined(TQT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_CYGWIN)
     union {
 	struct dirent mt_file;
 	char b[sizeof(struct dirent) + MAXNAMLEN + 1];
@@ -245,7 +245,7 @@ bool TQDir::readDirEntries( const TQString &nameFilter,
     while ( readdir_r(dir, &u.mt_file, &file ) == 0 && file )
 #else
     while ( (file = readdir(dir)) )
-#endif // QT_THREAD_SUPPORT && _POSIX_THREAD_SAFE_FUNCTIONS
+#endif // TQT_THREAD_SUPPORT && _POSIX_THREAD_SAFE_FUNCTIONS
     {
 	TQString fn = TQFile::decodeName(file->d_name);
 	fi.setFile( *this, fn );
@@ -311,10 +311,10 @@ const TQFileInfoList * TQDir::drives()
 
     if ( !knownMemoryLeak ) {
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 	TQMutexLocker locker( tqt_global_mutexpool ?
 			     tqt_global_mutexpool->get( &knownMemoryLeak ) : 0 );
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
 	if ( !knownMemoryLeak ) {
 	    knownMemoryLeak = new TQFileInfoList;
diff --git a/src/tools/qgarray.cpp b/src/tools/qgarray.cpp
index f2b41e50..1d4971c2 100644
--- a/src/tools/qgarray.cpp
+++ b/src/tools/qgarray.cpp
@@ -52,9 +52,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #  include <private/qmutexpool_p.h>
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
 /*
   If USE_MALLOC isn't defined, we use new[] and delete[] to allocate
@@ -733,10 +733,10 @@ void TQGArray::sort( uint sz )
     if ( numItems < 2 )
 	return;
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
     TQMutexLocker locker( tqt_global_mutexpool ?
 			 tqt_global_mutexpool->get( &cmp_item_size ) : 0 );
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
     cmp_item_size = sz;
     qsort( shd->data, numItems, sz, cmp_arr );
@@ -752,10 +752,10 @@ int TQGArray::bsearch( const char *d, uint sz ) const
     if ( !numItems )
 	return -1;
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
     TQMutexLocker locker( tqt_global_mutexpool ?
 			 tqt_global_mutexpool->get( &cmp_item_size ) : 0 );
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
     cmp_item_size = sz;
     char* r = (char*)::bsearch( d, shd->data, numItems, sz, cmp_arr );
diff --git a/src/tools/qglist.cpp b/src/tools/qglist.cpp
index 6c0455c9..3ed8bd93 100644
--- a/src/tools/qglist.cpp
+++ b/src/tools/qglist.cpp
@@ -43,9 +43,9 @@
 #include "ntqdatastream.h"
 #include "ntqvaluelist.h"
 
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
   #include "ntqmutex.h"
-#endif // defined(QT_THREAD_SUPPORT)
+#endif // defined(TQT_THREAD_SUPPORT)
 
 /*!
   \class TQLNode ntqglist.h
@@ -225,7 +225,7 @@ TQDataStream &TQGList::write( TQDataStream &s, TQPtrCollection::Item ) const
 
 TQGList::TQGList()
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex = new TQMutex(true);
 #endif
     firstNode = lastNode = curNode = 0;		// initialize list
@@ -241,7 +241,7 @@ TQGList::TQGList()
 TQGList::TQGList( const TQGList & list )
     : TQPtrCollection( list )
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex = new TQMutex(true);
 #endif
     firstNode = lastNode = curNode = 0;		// initialize list
@@ -268,7 +268,7 @@ TQGList::~TQGList()
     // twice on the same address! This is insane but let's try not to crash
     // here.
     iterators = 0;
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //delete mutex;
 #endif
 }
@@ -337,11 +337,11 @@ bool TQGList::operator==( const TQGList &list ) const
 
 TQLNode *TQGList::locate( uint index )
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     if ( index == (uint)curIndex ) {		// current node ?
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	//mutex->unlock();
 #endif
 	return curNode;
@@ -355,7 +355,7 @@ TQLNode *TQGList::locate( uint index )
     bool forward;				// direction to traverse
 
     if ( index >= numNodes ) {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	//mutex->unlock();
 #endif
 	return 0;
@@ -388,7 +388,7 @@ TQLNode *TQGList::locate( uint index )
 	}
     }
     curIndex = index;				// must update index
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
     return curNode = node;
@@ -401,7 +401,7 @@ TQLNode *TQGList::locate( uint index )
 
 void TQGList::inSort( TQPtrCollection::Item d )
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     int index = 0;
@@ -411,7 +411,7 @@ void TQGList::inSort( TQPtrCollection::Item d )
 	index++;
     }
     insertAt( index, d );
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
 }
@@ -423,7 +423,7 @@ void TQGList::inSort( TQPtrCollection::Item d )
 
 void TQGList::prepend( TQPtrCollection::Item d )
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     register TQLNode *n = new TQLNode( newItem(d) );
@@ -436,7 +436,7 @@ void TQGList::prepend( TQPtrCollection::Item d )
     firstNode = curNode = n;			// curNode affected
     numNodes++;
     curIndex = 0;
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
 }
@@ -448,7 +448,7 @@ void TQGList::prepend( TQPtrCollection::Item d )
 
 void TQGList::append( TQPtrCollection::Item d )
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     register TQLNode *n = new TQLNode( newItem(d) );
@@ -463,7 +463,7 @@ void TQGList::append( TQPtrCollection::Item d )
     lastNode = curNode = n;			// curNode affected
     curIndex = numNodes;
     numNodes++;
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
 }
@@ -475,26 +475,26 @@ void TQGList::append( TQPtrCollection::Item d )
 
 bool TQGList::insertAt( uint index, TQPtrCollection::Item d )
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     if ( index == 0 ) {
 	prepend( d );
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	//mutex->unlock();
 #endif
 	return TRUE;
     }
     else if ( index == numNodes ) {
 	append( d );
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	//mutex->unlock();
 #endif
 	return TRUE;
     }
     TQLNode *nextNode = locate( index );
     if ( !nextNode ) {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	//mutex->unlock();
 #endif
 	return FALSE;
@@ -509,7 +509,7 @@ bool TQGList::insertAt( uint index, TQPtrCollection::Item d )
     n->next = nextNode;
     curNode = n;				// curIndex set by locate()
     numNodes++;
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
     return TRUE;
@@ -522,11 +522,11 @@ bool TQGList::insertAt( uint index, TQPtrCollection::Item d )
 
 void TQGList::relinkNode( TQLNode *n )
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     if ( n == firstNode ) {			// already first
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	//mutex->unlock();
 #endif
 	return;
@@ -543,7 +543,7 @@ void TQGList::relinkNode( TQLNode *n )
     firstNode = curNode = n;			// curNode affected
     numNodes++;
     curIndex = 0;
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
 }
@@ -555,11 +555,11 @@ void TQGList::relinkNode( TQLNode *n )
 
 TQLNode *TQGList::unlink()
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     if ( curNode == 0 ) {			// null current node
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	//mutex->unlock();
 #endif
 	return 0;
@@ -593,7 +593,7 @@ TQLNode *TQGList::unlink()
 	iterators->notifyRemove( n, curNode );
     }
     numNodes--;
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
     return n;
@@ -606,7 +606,7 @@ TQLNode *TQGList::unlink()
 
 bool TQGList::removeNode( TQLNode *n )
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
 #if defined(QT_CHECK_NULL)
@@ -622,7 +622,7 @@ bool TQGList::removeNode( TQLNode *n )
     delete n;
     curNode  = firstNode;
     curIndex = curNode ? 0 : -1;
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
     return TRUE;
@@ -636,25 +636,25 @@ bool TQGList::removeNode( TQLNode *n )
 
 bool TQGList::remove( TQPtrCollection::Item d )
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     if ( d && find(d) == -1 ) {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	//mutex->unlock();
 #endif
 	return FALSE;
     }
     TQLNode *n = unlink();
     if ( !n ) {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	//mutex->unlock();
 #endif
 	return FALSE;
     }
     deleteItem( n->data );
     delete n;
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
     return TRUE;
@@ -666,25 +666,25 @@ bool TQGList::remove( TQPtrCollection::Item d )
 
 bool TQGList::removeRef( TQPtrCollection::Item d )
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     if ( findRef(d) == -1 ) {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	//mutex->unlock();
 #endif
 	return FALSE;
     }
     TQLNode *n = unlink();
     if ( !n ) {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	//mutex->unlock();
 #endif
 	return FALSE;
     }
     deleteItem( n->data );
     delete n;
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
     return TRUE;
@@ -708,25 +708,25 @@ bool TQGList::removeRef( TQPtrCollection::Item d )
 
 bool TQGList::removeAt( uint index )
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     if ( !locate(index) ) {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	//mutex->unlock();
 #endif
 	return FALSE;
     }
     TQLNode *n = unlink();
     if ( !n ) {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	//mutex->unlock();
 #endif
 	return FALSE;
     }
     deleteItem( n->data );
     delete n;
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
     return TRUE;
@@ -738,12 +738,12 @@ bool TQGList::removeAt( uint index )
 */
 bool TQGList::replaceAt( uint index, TQPtrCollection::Item d )
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     TQLNode *n = locate( index );
     if ( !n ) {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	//mutex->unlock();
 #endif
 	return FALSE;
@@ -752,7 +752,7 @@ bool TQGList::replaceAt( uint index, TQPtrCollection::Item d )
 	deleteItem( n->data );
 	n->data = newItem( d );
     }
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
     return TRUE;
@@ -766,14 +766,14 @@ bool TQGList::replaceAt( uint index, TQPtrCollection::Item d )
 
 TQPtrCollection::Item TQGList::takeNode( TQLNode *n )
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
 #if defined(QT_CHECK_NULL)
     if ( n == 0 || (n->prev && n->prev->next != n) ||
 	 (n->next && n->next->prev != n) ) {
 	tqWarning( "TQGList::takeNode: Corrupted node" );
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	//mutex->unlock();
 #endif
 	return 0;
@@ -785,7 +785,7 @@ TQPtrCollection::Item TQGList::takeNode( TQLNode *n )
     delete n;					// delete the node, not data
     curNode  = firstNode;
     curIndex = curNode ? 0 : -1;
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
     return d;
@@ -797,13 +797,13 @@ TQPtrCollection::Item TQGList::takeNode( TQLNode *n )
 
 TQPtrCollection::Item TQGList::take()
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     TQLNode *n = unlink();			// unlink node
     Item d = n ? n->data : 0;
     delete n;					// delete node, keep contents
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
     return d;
@@ -815,11 +815,11 @@ TQPtrCollection::Item TQGList::take()
 
 TQPtrCollection::Item TQGList::takeAt( uint index )
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     if ( !locate(index) ) {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	//mutex->unlock();
 #endif
 	return 0;
@@ -827,7 +827,7 @@ TQPtrCollection::Item TQGList::takeAt( uint index )
     TQLNode *n = unlink();			// unlink node
     Item d = n ? n->data : 0;
     delete n;					// delete node, keep contents
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
     return d;
@@ -839,14 +839,14 @@ TQPtrCollection::Item TQGList::takeAt( uint index )
 
 TQPtrCollection::Item TQGList::takeFirst()
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     first();
     TQLNode *n = unlink();			// unlink node
     Item d = n ? n->data : 0;
     delete n;
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
     return d;
@@ -858,14 +858,14 @@ TQPtrCollection::Item TQGList::takeFirst()
 
 TQPtrCollection::Item TQGList::takeLast()
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     last();
     TQLNode *n = unlink();			// unlink node
     Item d = n ? n->data : 0;
     delete n;
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
     return d;
@@ -878,7 +878,7 @@ TQPtrCollection::Item TQGList::takeLast()
 
 void TQGList::clear()
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     register TQLNode *n = firstNode;
@@ -898,7 +898,7 @@ void TQGList::clear()
 	n = n->next;
 	delete prevNode;			// deallocate node
     }
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
 }
@@ -911,7 +911,7 @@ void TQGList::clear()
 
 int TQGList::findRef( TQPtrCollection::Item d, bool fromStart )
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     register TQLNode *n;
@@ -929,7 +929,7 @@ int TQGList::findRef( TQPtrCollection::Item d, bool fromStart )
     }
     curNode = n;
     curIndex = n ? index : -1;
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
     return curIndex;				// return position of item
@@ -943,7 +943,7 @@ int TQGList::findRef( TQPtrCollection::Item d, bool fromStart )
 
 int TQGList::find( TQPtrCollection::Item d, bool fromStart )
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     register TQLNode *n;
@@ -961,7 +961,7 @@ int TQGList::find( TQPtrCollection::Item d, bool fromStart )
     }
     curNode = n;
     curIndex = n ? index : -1;
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
     return curIndex;				// return position of item
@@ -974,7 +974,7 @@ int TQGList::find( TQPtrCollection::Item d, bool fromStart )
 
 uint TQGList::containsRef( TQPtrCollection::Item d ) const
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     register TQLNode *n = firstNode;
@@ -984,7 +984,7 @@ uint TQGList::containsRef( TQPtrCollection::Item d ) const
 	    count++;
 	n = n->next;
     }
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
     return count;
@@ -997,7 +997,7 @@ uint TQGList::containsRef( TQPtrCollection::Item d ) const
 
 uint TQGList::contains( TQPtrCollection::Item d ) const
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     register TQLNode *n = firstNode;
@@ -1008,7 +1008,7 @@ uint TQGList::contains( TQPtrCollection::Item d ) const
 	    count++;
 	n = n->next;
     }
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
     return count;
@@ -1058,17 +1058,17 @@ uint TQGList::contains( TQPtrCollection::Item d ) const
 
 TQPtrCollection::Item TQGList::first()
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     if ( firstNode ) {
 	curIndex = 0;
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	//mutex->unlock();
 #endif
 	return (curNode=firstNode)->data;
     }
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
     return 0;
@@ -1080,17 +1080,17 @@ TQPtrCollection::Item TQGList::first()
 
 TQPtrCollection::Item TQGList::last()
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     if ( lastNode ) {
 	curIndex = numNodes-1;
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	//mutex->unlock();
 #endif
 	return (curNode=lastNode)->data;
     }
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
     return 0;
@@ -1102,14 +1102,14 @@ TQPtrCollection::Item TQGList::last()
 
 TQPtrCollection::Item TQGList::next()
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     if ( curNode ) {
 	if ( curNode->next ) {
 	    curIndex++;
 	    curNode = curNode->next;
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	    //mutex->unlock();
 #endif
 	    return curNode->data;
@@ -1117,7 +1117,7 @@ TQPtrCollection::Item TQGList::next()
 	curIndex = -1;
 	curNode = 0;
     }
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
     return 0;
@@ -1129,14 +1129,14 @@ TQPtrCollection::Item TQGList::next()
 
 TQPtrCollection::Item TQGList::prev()
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     if ( curNode ) {
 	if ( curNode->prev ) {
 	    curIndex--;
 	    curNode = curNode->prev;
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	    //mutex->unlock();
 #endif
 	    return curNode->data;
@@ -1144,7 +1144,7 @@ TQPtrCollection::Item TQGList::prev()
 	curIndex = -1;
 	curNode = 0;
     }
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
     return 0;
@@ -1157,12 +1157,12 @@ TQPtrCollection::Item TQGList::prev()
 
 void TQGList::toVector( TQGVector *vector ) const
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     vector->clear();
     if ( !vector->resize( count() ) ) {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	//mutex->unlock();
 #endif
 	return;
@@ -1174,14 +1174,14 @@ void TQGList::toVector( TQGVector *vector ) const
 	n = n->next;
 	i++;
     }
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
 }
 
 void TQGList::heapSortPushDown( TQPtrCollection::Item* heap, int first, int last )
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     int r = first;
@@ -1218,7 +1218,7 @@ void TQGList::heapSortPushDown( TQPtrCollection::Item* heap, int first, int last
 	    }
 	}
     }
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
 }
@@ -1233,12 +1233,12 @@ void TQGList::heapSortPushDown( TQPtrCollection::Item* heap, int first, int last
 
 void TQGList::sort()
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     uint n = count();
     if ( n < 2 ) {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	//mutex->unlock();
 #endif
 	return;
@@ -1273,7 +1273,7 @@ void TQGList::sort()
     }
 
     delete [] realheap;
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
 }
@@ -1300,7 +1300,7 @@ TQDataStream &operator<<( TQDataStream &s, const TQGList &list )
 
 TQDataStream &TQGList::read( TQDataStream &s )
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     uint num;
@@ -1326,7 +1326,7 @@ TQDataStream &TQGList::read( TQDataStream &s )
     }
     curNode  = firstNode;
     curIndex = curNode ? 0 : -1;
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
     return s;
@@ -1338,7 +1338,7 @@ TQDataStream &TQGList::read( TQDataStream &s )
 
 TQDataStream &TQGList::write( TQDataStream &s ) const
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     s << count();				// write number of items
@@ -1347,7 +1347,7 @@ TQDataStream &TQGList::write( TQDataStream &s ) const
 	write( s, n->data );
 	n = n->next;
     }
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
     return s;
@@ -1361,13 +1361,13 @@ TQDataStream &TQGList::write( TQDataStream &s ) const
  */
 TQLNode* TQGList::erase( TQLNode* it )
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     TQLNode* n = it;
     it = it->next;
     removeNode( n );
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
     return it;
diff --git a/src/tools/qgvector.cpp b/src/tools/qgvector.cpp
index af896ab7..2c8b13d6 100644
--- a/src/tools/qgvector.cpp
+++ b/src/tools/qgvector.cpp
@@ -51,9 +51,9 @@
 #include "ntqdatastream.h"
 #include <stdlib.h>
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #  include <private/qmutexpool_p.h>
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
 #define USE_MALLOC				// comment to use new/delete
 
@@ -405,10 +405,10 @@ void TQGVector::sort()				// sort vector
 	}
     }
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
     TQMutexLocker locker( tqt_global_mutexpool ?
 			 tqt_global_mutexpool->get( &sort_vec ) : 0 );
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
     sort_vec = (TQGVector*)this;
     qsort( vec, count(), sizeof(Item), cmp_vec );
diff --git a/src/tools/qlocale.cpp b/src/tools/qlocale.cpp
index 22c20cae..39a430e2 100644
--- a/src/tools/qlocale.cpp
+++ b/src/tools/qlocale.cpp
@@ -3244,7 +3244,7 @@ TQString TQLocalePrivate::doubleToString(double d,
         TQString digits;
 
 #ifdef QT_QLOCALE_USES_FCVT
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
         static bool dummy_for_mutex;
         TQMutex *fcvt_mutex =  tqt_global_mutexpool ? tqt_global_mutexpool->get( &dummy_for_mutex ) : 0;
 # define FCVT_LOCK if (fcvt_mutex) fcvt_mutex->lock()
diff --git a/src/tools/qmutex_unix.cpp b/src/tools/qmutex_unix.cpp
index ac466fd8..6d1a1423 100644
--- a/src/tools/qmutex_unix.cpp
+++ b/src/tools/qmutex_unix.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 
 #include "qplatformdefs.h"
 
@@ -720,4 +720,4 @@ int TQMutex::level()
     \sa TQMutexLocker::TQMutexLocker()
 */
 
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
diff --git a/src/tools/qmutexpool.cpp b/src/tools/qmutexpool.cpp
index 5bc6cce2..18cd5560 100644
--- a/src/tools/qmutexpool.cpp
+++ b/src/tools/qmutexpool.cpp
@@ -38,7 +38,7 @@
 
 #include "qmutexpool_p.h"
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 
 #include <ntqthread.h>
 
diff --git a/src/tools/qmutexpool_p.h b/src/tools/qmutexpool_p.h
index e560c994..cb2eef20 100644
--- a/src/tools/qmutexpool_p.h
+++ b/src/tools/qmutexpool_p.h
@@ -51,7 +51,7 @@
 //
 //
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 
 #ifndef QT_H
 #include "ntqmutex.h"
@@ -75,6 +75,6 @@ private:
 
 extern Q_EXPORT TQMutexPool *tqt_global_mutexpool;
 
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
 #endif // TQMUTEXPOOL_P_H
diff --git a/src/tools/qregexp.cpp b/src/tools/qregexp.cpp
index 7330f4f1..d5598c4d 100644
--- a/src/tools/qregexp.cpp
+++ b/src/tools/qregexp.cpp
@@ -52,10 +52,10 @@
 #include "ntqstring.h"
 #include "ntqtl.h"
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include "ntqthreadstorage.h"
 #include <private/qthreadinstance_p.h>
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
 #undef QT_TRANSLATE_NOOP
 #define QT_TRANSLATE_NOOP( context, sourceText ) sourceText
@@ -3212,25 +3212,25 @@ struct TQRegExpPrivate
 
 #ifndef QT_NO_REGEXP_OPTIM
 static TQSingleCleanupHandler<TQCache<TQRegExpEngine> > cleanup_cache;
-#  ifndef QT_THREAD_SUPPORT
+#  ifndef TQT_THREAD_SUPPORT
 static TQCache<TQRegExpEngine> *engineCache = 0;
-#  endif // QT_THREAD_SUPPORT
+#  endif // TQT_THREAD_SUPPORT
 #endif // QT_NO_REGEXP_OPTIM
 
 static void regexpEngine( TQRegExpEngine *&eng, const TQString &pattern,
 			  bool caseSensitive, bool deref )
 {
-#  ifdef QT_THREAD_SUPPORT
+#  ifdef TQT_THREAD_SUPPORT
     static TQThreadStorage<TQCache<TQRegExpEngine> *> engineCaches;
     TQCache<TQRegExpEngine> *engineCache = 0;
     TQThreadInstance *currentThread = TQThreadInstance::current();
     if (currentThread)
         engineCache = engineCaches.localData();
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
     if ( !deref ) {
 #ifndef QT_NO_REGEXP_OPTIM
-#  ifdef QT_THREAD_SUPPORT
+#  ifdef TQT_THREAD_SUPPORT
         if ( currentThread )
 #  endif
             {
@@ -3251,18 +3251,18 @@ static void regexpEngine( TQRegExpEngine *&eng, const TQString &pattern,
 
     if ( eng->deref() ) {
 #ifndef QT_NO_REGEXP_OPTIM
-#  ifdef QT_THREAD_SUPPORT
+#  ifdef TQT_THREAD_SUPPORT
         if ( currentThread )
 #  endif
             {
                 if ( engineCache == 0 ) {
                     engineCache = new TQCache<TQRegExpEngine>;
                     engineCache->setAutoDelete( TRUE );
-#  ifdef QT_THREAD_SUPPORT
+#  ifdef TQT_THREAD_SUPPORT
                     engineCaches.setLocalData(engineCache);
 #  else
                     cleanup_cache.set( &engineCache );
-#  endif // !QT_THREAD_SUPPORT
+#  endif // !TQT_THREAD_SUPPORT
                 }
                 if ( !pattern.isNull() &&
                      engineCache->insert(pattern, eng, 4 + pattern.length() / 4) )
diff --git a/src/tools/qsemaphore.cpp b/src/tools/qsemaphore.cpp
index d4f240f7..810837b4 100644
--- a/src/tools/qsemaphore.cpp
+++ b/src/tools/qsemaphore.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 
 #include "ntqsemaphore.h"
 #include "ntqmutex.h"
@@ -252,4 +252,4 @@ bool TQSemaphore::tryAccess(int n)
     return TRUE;
 }
 
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
diff --git a/src/tools/qstring.cpp b/src/tools/qstring.cpp
index 10f0a6d2..755d2677 100644
--- a/src/tools/qstring.cpp
+++ b/src/tools/qstring.cpp
@@ -93,9 +93,9 @@
 #define ULLONG_MAX TQ_UINT64_C(18446744073709551615)
 #endif
 
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
 #include "ntqmutex.h"
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
 
 extern TQMutex *tqt_sharedStringMutex;
 
@@ -1053,9 +1053,9 @@ TQStringData::TQStringData() : TQShared(),
 	maxl(0),
 	islatin1(FALSE),
 	security_unpaged(FALSE) {
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
 	mutex = new TQMutex(FALSE);
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
 	ref();
 }
 
@@ -1067,9 +1067,9 @@ TQStringData::TQStringData(TQChar *u, uint l, uint m) : TQShared(),
 	maxl(m),
 	islatin1(FALSE),
 	security_unpaged(FALSE) {
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
 	mutex = new TQMutex(FALSE);
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
 }
 
 TQStringData::~TQStringData() {
@@ -1084,12 +1084,12 @@ TQStringData::~TQStringData() {
 	if ( ascii ) {
 		delete[] ascii;
 	}
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
 	if ( mutex ) {
 		delete mutex;
 		mutex = NULL;
 	}
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
 }
 
 void TQStringData::setDirty() {
@@ -1457,14 +1457,14 @@ QT_STATIC_CONST_IMPL TQChar TQChar::nbsp((ushort)0x00a0);
 
 TQStringData* TQString::makeSharedNull()
 {
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
     if (tqt_sharedStringMutex) tqt_sharedStringMutex->lock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
 
     if (TQString::shared_null) {
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
 	if (tqt_sharedStringMutex) tqt_sharedStringMutex->unlock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
 	return TQString::shared_null;
     }
 
@@ -1474,9 +1474,9 @@ TQStringData* TQString::makeSharedNull()
     that->d = TQString::shared_null;
 #endif
 
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
     if (tqt_sharedStringMutex) tqt_sharedStringMutex->unlock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
     return TQString::shared_null;
 }
 
@@ -1517,13 +1517,13 @@ TQString::TQString( const TQString &s ) :
     d(s.d)
 {
     if ( d && (d != shared_null) ) {
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
         d->mutex->lock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
         d->ref();
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
         d->mutex->unlock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
     }
 }
 
@@ -1676,20 +1676,20 @@ TQString::~TQString()
 		return;
 	}
 
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
 	d->mutex->lock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
 	if ( d->deref() ) {
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
 		d->mutex->unlock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
 		d->deleteSelf();
 		d = NULL;
 	}
 	else {
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
 		d->mutex->unlock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
 	}
 }
 
@@ -1711,22 +1711,22 @@ void TQString::real_detach()
 void TQString::deref()
 {
 	if ( d && (d != shared_null) ) {
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
 		d->mutex->lock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
 		if ( d->deref() ) {
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
 			d->mutex->unlock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
 			if ( d != shared_null ) {
 				delete d;
 			}
 			d = 0;
 		}
 		else {
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
 			d->mutex->unlock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
 		}
 	}
 }
@@ -1769,13 +1769,13 @@ void TQStringData::deleteSelf()
 TQString &TQString::operator=( const TQString &s )
 {
     if ( s.d && (s.d != shared_null) ) {
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
         s.d->mutex->lock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
         s.d->ref();
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
         s.d->mutex->unlock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
     }
     deref();
     d = s.d;
@@ -1883,9 +1883,9 @@ void TQString::truncate( uint newLen )
 */
 void TQString::setLength( uint newLen )
 {
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
     d->mutex->lock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
 
     if ( d->count != 1 || newLen > d->maxl ||
 	 ( newLen * 4 < d->maxl && d->maxl > 4 ) ) {
@@ -1896,24 +1896,24 @@ void TQString::setLength( uint newLen )
 	    uint len = TQMIN( d->len, newLen );
 	    memcpy( nd, d->unicode, sizeof(TQChar) * len );
 	    bool unpaged = d->security_unpaged;
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
 	    d->mutex->unlock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
 	    deref();
 	    d = new TQStringData( nd, newLen, newMax );
 	    setSecurityUnPaged(unpaged);
 	}
 	else {
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
 	    d->mutex->unlock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
 	}
     }
     else {
 	d->len = newLen;
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
 	d->mutex->unlock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
 	d->setDirty();
     }
 }
@@ -1999,21 +1999,21 @@ void TQString::squeeze()
 */
 void TQString::grow( uint newLen )
 {
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
     d->mutex->lock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
 
     if ( d->count != 1 || newLen > d->maxl ) {
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
 	d->mutex->unlock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
 	setLength( newLen );
     }
     else {
 	d->len = newLen;
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
 	d->mutex->unlock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
 	d->setDirty();
     }
 }
@@ -6423,19 +6423,19 @@ TQString TQString::fromUcs2( const unsigned short *str )
 */
 
 TQChar& TQString::ref(uint i) {
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
 	d->mutex->lock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
 	if ( (d->count != 1) || (i >= d->len) ) {
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
 		d->mutex->unlock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
 		subat( i );
 	}
 	else {
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
 		d->mutex->unlock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
 	}
 	d->setDirty();
 	return d->unicode[i];
@@ -6523,9 +6523,9 @@ TQString& TQString::setUnicode( const TQChar *unicode, uint len )
 		}
 	}
 	else {
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
 		d->mutex->lock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
 		if ( d->count != 1 || len > d->maxl || ( len * 4 < d->maxl && d->maxl > 4 ) ) {
 			// detach, grown or shrink
 			uint newMax = computeNewMax( len );
@@ -6533,17 +6533,17 @@ TQString& TQString::setUnicode( const TQChar *unicode, uint len )
 			if ( unicode ) {
 				memcpy( nd, unicode, sizeof(TQChar)*len );
 			}
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
 			d->mutex->unlock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
 			deref();
 			d = new TQStringData( nd, len, newMax );
 		}
 		else {
 			d->len = len;
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
 			d->mutex->unlock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
 			d->setDirty();
 			if ( unicode ) {
 				memcpy( d->unicode, unicode, sizeof(TQChar)*len );
@@ -7254,9 +7254,9 @@ TQConstString::TQConstString( const TQChar* unicode, uint length ) :
 */
 TQConstString::~TQConstString()
 {
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
     d->mutex->lock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
 
     if ( d->count > 1 ) {
 	TQChar* cp = QT_ALLOC_QCHAR_VEC( d->len );
@@ -7268,9 +7268,9 @@ TQConstString::~TQConstString()
     }
 
     // The original d->unicode is now unlinked.
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
     d->mutex->unlock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
 }
 
 /*!
diff --git a/src/tools/qthreadinstance_p.h b/src/tools/qthreadinstance_p.h
index 9fae260e..14f0de59 100644
--- a/src/tools/qthreadinstance_p.h
+++ b/src/tools/qthreadinstance_p.h
@@ -51,7 +51,7 @@
 //
 //
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 
 #ifndef QT_H
 #include "ntqmutex.h"
@@ -105,5 +105,5 @@ public:
     bool disableThreadPostedEvents : 1;
 };
 
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 #endif // TQTHREAD_P_H
diff --git a/src/tools/qthreadstorage_unix.cpp b/src/tools/qthreadstorage_unix.cpp
index df4c3866..d53f6fb6 100644
--- a/src/tools/qthreadstorage_unix.cpp
+++ b/src/tools/qthreadstorage_unix.cpp
@@ -36,7 +36,7 @@
 **
 **********************************************************************/
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 
 #include "qplatformdefs.h"
 
@@ -346,4 +346,4 @@ void TQThreadStorageData::finish( void **thread_storage )
     \sa localData() hasLocalData()
 */
 
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
diff --git a/src/tools/qwaitcondition_unix.cpp b/src/tools/qwaitcondition_unix.cpp
index 2d985332..62038bae 100644
--- a/src/tools/qwaitcondition_unix.cpp
+++ b/src/tools/qwaitcondition_unix.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 
 #include "qplatformdefs.h"
 
@@ -313,4 +313,4 @@ bool TQWaitCondition::wait(TQMutex *mutex, unsigned long time)
     return (ret == 0);
 }
 
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT