diff options
| author | Michele Calgaro <[email protected]> | 2018-09-18 01:19:46 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2018-09-18 01:19:46 +0900 |
| commit | 2df70f03d493f5226821dd2e1da3759e3abceb02 (patch) | |
| tree | f105d7829be7401bd27b833e0e26cf64c6a62ad1 /src/kernel/qeventloop_x11.cpp | |
| parent | f849f22528ee9eb5eeb1f9aa92822846b2b3e01f (diff) | |
| download | qt3-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/qeventloop_x11.cpp')
| -rw-r--r-- | src/kernel/qeventloop_x11.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/kernel/qeventloop_x11.cpp b/src/kernel/qeventloop_x11.cpp index cb019d3..2839ca0 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(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) # include "qmutex.h" -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT #include <errno.h> @@ -138,7 +138,7 @@ bool QEventLoop::processEvents( ProcessEventsFlags flags ) XEvent event; int nevents = 0; -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) QMutexLocker locker( QApplication::qt_mutex ); #endif @@ -283,7 +283,7 @@ bool QEventLoop::processEvents( ProcessEventsFlags flags ) // unlock the GUI mutex and select. when we return from this function, there is // something for us to do -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) if ( locker.mutex() ) locker.mutex()->unlock(); else return false; #endif @@ -298,7 +298,7 @@ bool QEventLoop::processEvents( ProcessEventsFlags flags ) } while (nsel == -1 && (errno == EINTR || errno == EAGAIN)); // relock the GUI mutex before processing any pending events -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) if ( locker.mutex() ) locker.mutex()->lock(); else return false; #endif |