9 files changed, 26 insertions, 30 deletions
diff --git a/doc/html/qapplication-h.html b/doc/html/qapplication-h.html
index d2911b400..bd959e385 100644
--- a/doc/html/qapplication-h.html
+++ b/doc/html/qapplication-h.html
@@ -94,9 +94,9 @@ class TQEventLoop;
 class TQWSDecoration;
 #endif
 
-#ifdef TQT_THREAD_SUPPORT
+#ifndef TQT_NO_THREAD
 class TQMutex;
-#endif // TQT_THREAD_SUPPORT
+#endif // TQT_NO_THREAD
 
 
 class TQApplication;
@@ -316,7 +316,7 @@ public:
     static bool x11_apply_settings();
 #endif
     void	     wakeUpGuiThread();
-#if defined(TQT_THREAD_SUPPORT)
+#ifndef TQT_NO_THREAD
     void	     lock();
     void	     unlock(bool wakeUpGui = TRUE);
     bool	     locked();
@@ -367,9 +367,9 @@ private:
     friend void tqt_init(int *, char **, TQApplication::Type);
 #endif
 
-#ifdef TQT_THREAD_SUPPORT
+#ifndef TQT_NO_THREAD
     static TQMutex   *tqt_mutex;
-#endif // TQT_THREAD_SUPPORT
+#endif // TQT_NO_THREAD
 
     int		     app_argc;
     char	   **app_argv;
diff --git a/doc/html/qeventloop-h.html b/doc/html/qeventloop-h.html
index 7ddf52e36..711863a7b 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)
+#ifndef TQT_NO_THREAD
 class TQMutex;
-#endif // TQT_THREAD_SUPPORT
+#endif // TQT_NO_THREAD
 
 
 class TQ_EXPORT TQEventLoop : public TQObject
diff --git a/doc/html/qmake-manual-6.html b/doc/html/qmake-manual-6.html
index cea91e191..227f34c7d 100644
--- a/doc/html/qmake-manual-6.html
+++ b/doc/html/qmake-manual-6.html
@@ -101,22 +101,22 @@ body { background: #ffffff; color: black; }
 <pre>
     win32 {
         thread {
-            DEFINES += TQT_THREAD_SUPPORT
+            DEFINES += ENABLE_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 += ENABLE_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 += ENABLE_THREAD_SUPPORT
     } else:debug {
-        DEFINES += QT_NOTHREAD_DEBUG
+        DEFINES += NOTHREAD_DEBUG
     } else {
         message("Unknown configuration")
     }
@@ -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 += ENABLE_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 ENABLE_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 8f9eba58e..3a8b9d668 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(TQT_THREAD_SUPPORT)
+#ifndef TQT_NO_THREAD
 
 class TQMutexPrivate;
 
diff --git a/doc/html/qsemaphore-h.html b/doc/html/qsemaphore-h.html
index a80c1de15..1f4d09561 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(TQT_THREAD_SUPPORT)
+#ifndef TQT_NO_THREAD
 
 class TQSemaphorePrivate;
 
diff --git a/doc/html/qthread-h.html b/doc/html/qthread-h.html
index cbde3d13e..86dea0f69 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(TQT_THREAD_SUPPORT)
+#ifndef TQT_NO_THREAD
 
 #ifndef QT_H
 #include "ntqwindowdefs.h"
@@ -152,7 +152,7 @@ private:
 #endif // TQ_DISABLE_COPY
 };
 
-#endif // TQT_THREAD_SUPPORT
+#endif // TQT_NO_THREAD
 
 #endif // TQTHREAD_H
 </pre>
diff --git a/doc/html/qthreadstorage-h.html b/doc/html/qthreadstorage-h.html
index 7efc05556..629de64c5 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 TQT_THREAD_SUPPORT
+#ifndef TQT_NO_THREAD
 
 #ifndef QT_H
 #include "ntqglobal.h"
@@ -126,7 +126,7 @@ public:
     { (void) d.set( t ); }
 };
 
-#endif // TQT_THREAD_SUPPORT
+#endif // TQT_NO_THREAD
 
 #endif // TQTHREADSTORAGE_H
 </pre>
diff --git a/doc/html/qwaitcondition-h.html b/doc/html/qwaitcondition-h.html
index 06589092f..5779eda81 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(TQT_THREAD_SUPPORT)
+#ifndef TQT_NO_THREAD
 
 #include &lt;limits.h&gt;
 
diff --git a/doc/html/threads.html b/doc/html/threads.html
index 6e13f2488..8d84c8977 100644
--- a/doc/html/threads.html
+++ b/doc/html/threads.html
@@ -74,16 +74,12 @@ threading see our <a href="#reading">Recommended Reading</a> list.
 </h2>
 <a name="2"></a><p> When TQt is installed on Windows, thread support is an option on some
 compilers. 
-<p> On Mac OS X and Unix, thread support is enabled by adding the
-<tt>-thread</tt> option when running the <tt>configure</tt> script.  On Unix
-platforms where multithreaded programs must be linked in special ways,
-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>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> On Mac OS X and Unix, thread support is enabled by default on platforms which
+support it. It might be disabled by adding the <tt>-no-thread</tt> option when
+running the <tt>configure</tt> script.  Due to historical reasons on Unix platforms,
+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 <tt>libtqt</tt> library.
 <p> <h2> The Thread Classes
 </h2>
 <a name="3"></a><p> These classes are built into the TQt library when thread support is enabled: