10 files changed, 23 insertions, 23 deletions
diff --git a/doc/html/qapplication-h.html b/doc/html/qapplication-h.html
index 670800d..ffd71a7 100644
--- a/doc/html/qapplication-h.html
+++ b/doc/html/qapplication-h.html
@@ -94,9 +94,9 @@ class QEventLoop;
 class QWSDecoration;
 #endif
 
-#ifdef TQT_THREAD_SUPPORT
+#ifdef QT_THREAD_SUPPORT
 class QMutex;
-#endif // TQT_THREAD_SUPPORT
+#endif // QT_THREAD_SUPPORT
 
 
 class QApplication;
@@ -316,7 +316,7 @@ public:
     static bool x11_apply_settings();
 #endif
     void	     wakeUpGuiThread();
-#if defined(TQT_THREAD_SUPPORT)
+#if defined(QT_THREAD_SUPPORT)
     void	     lock();
     void	     unlock(bool wakeUpGui = TRUE);
     bool	     locked();
@@ -367,9 +367,9 @@ private:
     friend void qt_init(int *, char **, QApplication::Type);
 #endif
 
-#ifdef TQT_THREAD_SUPPORT
+#ifdef QT_THREAD_SUPPORT
     static QMutex   *qt_mutex;
-#endif // TQT_THREAD_SUPPORT
+#endif // QT_THREAD_SUPPORT
 
     int		     app_argc;
     char	   **app_argv;
diff --git a/doc/html/qeventloop-h.html b/doc/html/qeventloop-h.html
index d1446c7..c1c5ff4 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(TQT_THREAD_SUPPORT)
+#if defined(QT_THREAD_SUPPORT)
 class QMutex;
-#endif // TQT_THREAD_SUPPORT
+#endif // QT_THREAD_SUPPORT
 
 
 class Q_EXPORT QEventLoop : public QObject
diff --git a/doc/html/qmake-manual-6.html b/doc/html/qmake-manual-6.html
index 0f68562..16c3291 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 += TQT_THREAD_SUPPORT
+            DEFINES += QT_THREAD_SUPPORT
         }
     }
 </pre>
 <p>To save writing many nested scopes, you can nest scopes using a colon like this:</p>
 <pre>
     win32:thread {
-        DEFINES += TQT_THREAD_SUPPORT
+        DEFINES += QT_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 += TQT_THREAD_SUPPORT
+        DEFINES += QT_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 += TQT_THREAD_SUPPORT
+        DEFINES += QT_THREAD_SUPPORT
     }
 </pre>
-<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>
+<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>
 <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 d91f23b..9c20161 100644
--- a/doc/html/qmutex-h.html
+++ b/doc/html/qmutex-h.html
@@ -81,7 +81,7 @@ body { background: #ffffff; color: black; }
 #include "qglobal.h"
 #endif // QT_H
 
-#if defined(TQT_THREAD_SUPPORT)
+#if defined(QT_THREAD_SUPPORT)
 
 class QMutexPrivate;
 
diff --git a/doc/html/qsemaphore-h.html b/doc/html/qsemaphore-h.html
index 0356580..488513f 100644
--- a/doc/html/qsemaphore-h.html
+++ b/doc/html/qsemaphore-h.html
@@ -81,7 +81,7 @@ body { background: #ffffff; color: black; }
 #include "qglobal.h"
 #endif // QT_H
 
-#if defined(TQT_THREAD_SUPPORT)
+#if defined(QT_THREAD_SUPPORT)
 
 class QSemaphorePrivate;
 
diff --git a/doc/html/qthread-h.html b/doc/html/qthread-h.html
index 38e8b98..3cf9941 100644
--- a/doc/html/qthread-h.html
+++ b/doc/html/qthread-h.html
@@ -77,7 +77,7 @@ body { background: #ffffff; color: black; }
 #ifndef QTHREAD_H
 #define QTHREAD_H
 
-#if defined(TQT_THREAD_SUPPORT)
+#if defined(QT_THREAD_SUPPORT)
 
 #ifndef QT_H
 #include "qwindowdefs.h"
@@ -161,7 +161,7 @@ private:
 #endif // Q_DISABLE_COPY
 };
 
-#endif // TQT_THREAD_SUPPORT
+#endif // QT_THREAD_SUPPORT
 
 #endif // QTHREAD_H
 </pre>
diff --git a/doc/html/qthreadstorage-h.html b/doc/html/qthreadstorage-h.html
index 5d0eb61..86c926a 100644
--- a/doc/html/qthreadstorage-h.html
+++ b/doc/html/qthreadstorage-h.html
@@ -75,7 +75,7 @@ body { background: #ffffff; color: black; }
 #ifndef QTHREADSTORAGE_H
 #define QTHREADSTORAGE_H
 
-#ifdef TQT_THREAD_SUPPORT
+#ifdef QT_THREAD_SUPPORT
 
 #ifndef QT_H
 #include "qglobal.h"
@@ -126,7 +126,7 @@ public:
     { (void) d.set( t ); }
 };
 
-#endif // TQT_THREAD_SUPPORT
+#endif // QT_THREAD_SUPPORT
 
 #endif // QTHREADSTORAGE_H
 </pre>
diff --git a/doc/html/qwaitcondition-h.html b/doc/html/qwaitcondition-h.html
index ed47030..18e7739 100644
--- a/doc/html/qwaitcondition-h.html
+++ b/doc/html/qwaitcondition-h.html
@@ -81,7 +81,7 @@ body { background: #ffffff; color: black; }
 #include "qglobal.h"
 #endif // QT_H
 
-#if defined(TQT_THREAD_SUPPORT)
+#if defined(QT_THREAD_SUPPORT)
 
 #include &lt;limits.h&gt;
 
diff --git a/doc/html/threads.html b/doc/html/threads.html
index 5001f3a..c25cc8a 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>libqt-mt</tt> and hence threaded programs must be linked
 against this library (with <tt>-lqt-mt</tt>) rather than the standard Qt
 library.
-<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
+<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
 entry in <tt>qconfig.h</tt>.
 <p> <h2> The Thread Classes
 </h2>
diff --git a/doc/threads.doc b/doc/threads.doc
index c7b197c..febd0d1 100644
--- a/doc/threads.doc
+++ b/doc/threads.doc
@@ -69,8 +69,8 @@ against this library (with \c{-lqt-mt}) rather than the standard Qt
 library.
 
 On both platforms, you should compile with the macro \c
-TQT_THREAD_SUPPORT defined (e.g. compile with
-\c{-DTQT_THREAD_SUPPORT}). On Windows, this is usually done by an
+QT_THREAD_SUPPORT defined (e.g. compile with
+\c{-DQT_THREAD_SUPPORT}). On Windows, this is usually done by an
 entry in \c{qconfig.h}.
 
 \section1 The Thread Classes