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/codecs/qtextcodec.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/codecs/qtextcodec.cpp') diff --git a/src/codecs/qtextcodec.cpp b/src/codecs/qtextcodec.cpp index b85f5e9..80d0093 100644 --- a/src/codecs/qtextcodec.cpp +++ b/src/codecs/qtextcodec.cpp @@ -75,9 +75,9 @@ # include "qfontcodecs_p.h" #endif -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT # include -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT #include #include @@ -121,12 +121,12 @@ void QTextCodec::deleteAllCodecs() if ( !all ) return; -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT QMutexLocker locker( qt_global_mutexpool ? qt_global_mutexpool->get( &all ) : 0 ); if ( !all ) return; -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT destroying_is_ok = TRUE; @@ -151,11 +151,11 @@ static inline void setup() { if ( all ) return; -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT QMutexLocker locker( qt_global_mutexpool ? qt_global_mutexpool->get( &all ) : 0 ); if ( all ) return; -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT realSetup(); } -- cgit v1.2.3