summaryrefslogtreecommitdiffstats
path: root/src/kernel/qapplication_x11.cpp
diff options
context:
space:
mode:
authorMichele Calgaro <[email protected]>2018-09-18 01:19:46 +0900
committerMichele Calgaro <[email protected]>2018-09-18 01:19:46 +0900
commit2df70f03d493f5226821dd2e1da3759e3abceb02 (patch)
treef105d7829be7401bd27b833e0e26cf64c6a62ad1 /src/kernel/qapplication_x11.cpp
parentf849f22528ee9eb5eeb1f9aa92822846b2b3e01f (diff)
downloadqt3-2df70f03d493f5226821dd2e1da3759e3abceb02.tar.gz
qt3-2df70f03d493f5226821dd2e1da3759e3abceb02.zip
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.
Diffstat (limited to 'src/kernel/qapplication_x11.cpp')
-rw-r--r--src/kernel/qapplication_x11.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp
index 35abe06..c93c60f 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(TQT_THREAD_SUPPORT)
+#if defined(QT_THREAD_SUPPORT)
# include "qthread.h"
#endif
@@ -1645,7 +1645,7 @@ void qt_init_internal( int *argcptr, char **argv,
setlocale( LC_ALL, "" ); // use correct char set mapping
setlocale( LC_NUMERIC, "C" ); // make sprintf()/scanf() work
-#if defined(TQT_THREAD_SUPPORT)
+#if defined(QT_THREAD_SUPPORT)
if (( qt_is_gui_used ) && ( !display )) {
// If Qt is running standalone with a GUI, initialize X11 threading
XInitThreads();
@@ -2210,7 +2210,7 @@ void qt_init_internal( int *argcptr, char **argv,
QPainter::initialize();
}
-#if defined(TQT_THREAD_SUPPORT)
+#if defined(QT_THREAD_SUPPORT)
QThread::initialize();
#endif
@@ -2498,7 +2498,7 @@ void qt_cleanup()
QColor::cleanup();
QSharedDoubleBuffer::cleanup();
}
-#if defined(TQT_THREAD_SUPPORT)
+#if defined(QT_THREAD_SUPPORT)
QThread::cleanup();
#endif