diff options
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/global/qtypeinfo.h | 2 | ||||
| -rw-r--r-- | src/corelib/thread/qthreadpool.cpp | 8 |
2 files changed, 1 insertions, 9 deletions
diff --git a/src/corelib/global/qtypeinfo.h b/src/corelib/global/qtypeinfo.h index c0617a41f25..b9159a2e1a6 100644 --- a/src/corelib/global/qtypeinfo.h +++ b/src/corelib/global/qtypeinfo.h @@ -218,7 +218,7 @@ inline void swap(TYPE &value1, TYPE &value2) \ { value1.swap(value2); } #define Q_DECLARE_SHARED(TYPE) Q_DECLARE_SHARED_IMPL(TYPE, Q_MOVABLE_TYPE) #define Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(TYPE) \ - Q_DECLARE_SHARED_IMPL(TYPE, QT_VERSION >= QT_VERSION_CHECK(6,0,0) ? Q_MOVABLE_TYPE : Q_RELOCATABLE_TYPE) + Q_DECLARE_SHARED_IMPL(TYPE, Q_MOVABLE_TYPE) namespace QTypeTraits { diff --git a/src/corelib/thread/qthreadpool.cpp b/src/corelib/thread/qthreadpool.cpp index 1478cfcb191..1b417aa8be6 100644 --- a/src/corelib/thread/qthreadpool.cpp +++ b/src/corelib/thread/qthreadpool.cpp @@ -769,19 +769,11 @@ void QThreadPool::clear() d->clear(); } -#if QT_VERSION < QT_VERSION_CHECK(6,0,0) -/*! - \internal - - Returns \c true if \a thread is a thread managed by this thread pool. -*/ -#else /*! \since 6.0 Returns \c true if \a thread is a thread managed by this thread pool. */ -#endif bool QThreadPool::contains(const QThread *thread) const { Q_D(const QThreadPool); |