From 2df70f03d493f5226821dd2e1da3759e3abceb02 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Tue, 18 Sep 2018 01:19:46 +0900 Subject: 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. --- src/tools/qcomlibrary.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/tools/qcomlibrary.cpp') diff --git a/src/tools/qcomlibrary.cpp b/src/tools/qcomlibrary.cpp index 2c7da71..8d13549 100644 --- a/src/tools/qcomlibrary.cpp +++ b/src/tools/qcomlibrary.cpp @@ -48,9 +48,9 @@ #include #endif // NO_ERROR_H -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT # include "qmutexpool_p.h" -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT #ifndef QT_DEBUG_COMPONENT # if defined(QT_DEBUG) @@ -94,7 +94,7 @@ static bool qt_verify( const QString& library, uint version, uint flags, const QCString &key, bool warn ) { uint our_flags = 1; -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) our_flags |= 2; #endif @@ -398,10 +398,10 @@ void QComLibrary::createInstanceInternal() bool query_done = FALSE; bool warn_mismatch = TRUE; -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT QMutexLocker locker( qt_global_mutexpool ? qt_global_mutexpool->get( &cache ) : 0 ); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT if ( ! cache ) { cache = new QSettings; -- cgit v1.2.3