| 2df70f03 | 2018-09-17 11:19:46 | Michele Calgaro |
Revert "QT_THREAD_SUPPORT -> TQT_THREAD_SUPPORT conversion to align to updated admin module" The original commit was a mistake and should not have been pushed. This reverts commit f849f22528ee9eb5eeb1f9aa92822846b2b3e01f. |
||
|
M doc/html/qapplication-h.html M doc/html/qeventloop-h.html M doc/html/qmake-manual-6.html M doc/html/qmutex-h.html M doc/html/qsemaphore-h.html M doc/html/qthread-h.html M doc/html/qthreadstorage-h.html M doc/html/qwaitcondition-h.html M doc/html/threads.html M doc/threads.doc M mkspecs/aix-g++-64/qplatformdefs.h M mkspecs/aix-g++/qplatformdefs.h M mkspecs/aix-xlc-64/qplatformdefs.h M mkspecs/aix-xlc/qplatformdefs.h M mkspecs/bsdi-g++/qplatformdefs.h M mkspecs/cygwin-g++/qplatformdefs.h M mkspecs/darwin-g++/qplatformdefs.h M mkspecs/dgux-g++/qplatformdefs.h M mkspecs/freebsd-clang/qplatformdefs.h M mkspecs/freebsd-g++/qplatformdefs.h M mkspecs/freebsd-icc/qplatformdefs.h M mkspecs/hpux-acc-64/qplatformdefs.h M mkspecs/hpux-acc-o64/qplatformdefs.h M mkspecs/hpux-acc/qplatformdefs.h M mkspecs/hpux-cc/qplatformdefs.h M mkspecs/hpux-g++-64/qplatformdefs.h M mkspecs/hpux-g++/qplatformdefs.h M mkspecs/hpuxi-acc-32/qplatformdefs.h M mkspecs/hpuxi-acc-64/qplatformdefs.h M mkspecs/hurd-g++/qplatformdefs.h M mkspecs/irix-cc-64/qplatformdefs.h M mkspecs/irix-cc-o32/qplatformdefs.h M mkspecs/irix-cc/qplatformdefs.h M mkspecs/irix-g++/qplatformdefs.h M mkspecs/linux-clang/qplatformdefs.h M mkspecs/linux-cxx/qplatformdefs.h M mkspecs/linux-ecc-64/qplatformdefs.h M mkspecs/linux-g++-32/qplatformdefs.h M mkspecs/linux-g++-64/qplatformdefs.h M mkspecs/linux-g++-sparc/qplatformdefs.h M mkspecs/linux-g++/qplatformdefs.h M mkspecs/linux-icc/qplatformdefs.h M mkspecs/linux-kcc/qplatformdefs.h M mkspecs/linux-kylix/qplatformdefs.h M mkspecs/linux-pgcc/qplatformdefs.h M mkspecs/lynxos-g++/qplatformdefs.h M mkspecs/macx-g++/qplatformdefs.h M mkspecs/macx-mwerks/qplatformdefs.h M mkspecs/macx-pbuilder/qplatformdefs.h M mkspecs/macx-xlc/qplatformdefs.h M mkspecs/netbsd-g++/qplatformdefs.h M mkspecs/openbsd-g++/qplatformdefs.h M mkspecs/qnx-g++/qplatformdefs.h M mkspecs/reliant-cds-64/qplatformdefs.h M mkspecs/reliant-cds/qplatformdefs.h M mkspecs/sco-cc/qplatformdefs.h M mkspecs/sco-g++/qplatformdefs.h M mkspecs/solaris-cc-64/qplatformdefs.h M mkspecs/solaris-cc/qplatformdefs.h M mkspecs/solaris-g++-64/qplatformdefs.h M mkspecs/solaris-g++/qplatformdefs.h M mkspecs/tru64-cxx/qplatformdefs.h M mkspecs/tru64-g++/qplatformdefs.h M mkspecs/unixware-cc/qplatformdefs.h M mkspecs/unixware-g++/qplatformdefs.h M qmake/book/qmake-advanced.leaf M qmake/generators/unix/unixmake.cpp M qmake/generators/win32/borland_bmake.cpp M qmake/generators/win32/mingw_make.cpp M qmake/generators/win32/msvc_dsp.cpp M qmake/generators/win32/msvc_nmake.cpp M qmake/generators/win32/msvc_vcproj.cpp M src/codecs/qtextcodec.cpp M src/codecs/qtextcodecfactory.cpp M src/dialogs/qfiledialog.cpp M src/inputmethod/qinputcontextfactory.cpp M src/kernel/qapplication.cpp M src/kernel/qapplication.h M src/kernel/qapplication_x11.cpp M src/kernel/qeventloop.cpp M src/kernel/qeventloop.h M src/kernel/qeventloop_unix_glib.cpp M src/kernel/qeventloop_x11.cpp M src/kernel/qeventloop_x11_glib.cpp M src/kernel/qfont_x11.cpp M src/kernel/qgplugin.h M src/kernel/qmetaobject.cpp M src/kernel/qobject.cpp M src/kernel/qobject.h M src/kernel/qthread.cpp M src/kernel/qthread.h M src/kernel/qthread_unix.cpp M src/kernel/qwidget.cpp M src/moc/moc.y M src/moc/moc_yacc.cpp M src/qt.pro M src/tools/qcom_p.h M src/tools/qcomlibrary.cpp M src/tools/qcriticalsection_p.cpp M src/tools/qcriticalsection_p.h M src/tools/qcstring.cpp M src/tools/qdatetime.cpp M src/tools/qdir_unix.cpp M src/tools/qgarray.cpp M src/tools/qglist.cpp M src/tools/qglist.h M src/tools/qgvector.cpp M src/tools/qlocale.cpp M src/tools/qmutex.h M src/tools/qmutex_unix.cpp M src/tools/qmutexpool.cpp M src/tools/qmutexpool_p.h M src/tools/qregexp.cpp M src/tools/qsemaphore.cpp M src/tools/qsemaphore.h M src/tools/qstring.cpp M src/tools/qthreadinstance_p.h M src/tools/qthreadstorage.h M src/tools/qthreadstorage_unix.cpp M src/tools/qwaitcondition.h M src/tools/qwaitcondition_unix.cpp |
||
doc/html/qapplication-h.htmldiff --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 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 @@ 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 @@ 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; doc/html/qeventloop-h.htmldiff --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 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 doc/html/qmake-manual-6.htmldiff --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 @@ <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 @@ <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> doc/html/qmutex-h.htmldiff --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 @@ #include "qglobal.h" #endif // QT_H -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) class QMutexPrivate; doc/html/qsemaphore-h.htmldiff --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 @@ #include "qglobal.h" #endif // QT_H -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) class QSemaphorePrivate; doc/html/qthread-h.htmldiff --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 @@ #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 @@ #endif // Q_DISABLE_COPY }; -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT #endif // QTHREAD_H </pre> doc/html/qthreadstorage-h.htmldiff --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 @@ #ifndef QTHREADSTORAGE_H #define QTHREADSTORAGE_H -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT #ifndef QT_H #include "qglobal.h" @@ -126,7 +126,7 @@ { (void) d.set( t ); }
}; -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT #endif // QTHREADSTORAGE_H </pre> doc/html/qwaitcondition-h.htmldiff --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 @@ #include "qglobal.h" #endif // QT_H -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) #include <limits.h> doc/html/threads.htmldiff --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 @@ 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> doc/threads.docdiff --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 @@ 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 mkspecs/aix-g++-64/qplatformdefs.hdiff --git a/mkspecs/aix-g++-64/qplatformdefs.h b/mkspecs/aix-g++-64/qplatformdefs.h index c87b788..bcd9374 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 TQT_THREAD_SUPPORT +#ifdef QT_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; mkspecs/aix-g++/qplatformdefs.hdiff --git a/mkspecs/aix-g++/qplatformdefs.h b/mkspecs/aix-g++/qplatformdefs.h index 4b3c542..9202898 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 TQT_THREAD_SUPPORT +#ifdef QT_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; mkspecs/aix-xlc-64/qplatformdefs.hdiff --git a/mkspecs/aix-xlc-64/qplatformdefs.h b/mkspecs/aix-xlc-64/qplatformdefs.h index 46848c1..b5582c5 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 TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT #include <pthread.h> #endif mkspecs/aix-xlc/qplatformdefs.hdiff --git a/mkspecs/aix-xlc/qplatformdefs.h b/mkspecs/aix-xlc/qplatformdefs.h index f001d58..79afa5d 100644 --- a/mkspecs/aix-xlc/qplatformdefs.h +++ b/mkspecs/aix-xlc/qplatformdefs.h** Diff limit reached (max: 250 lines) ** |
||