1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Q*Mutex: unexport for Qt 7

Browse Source 
Those weren't caught for the Qt 6.0 release.

Pick-to: 6.10
Change-Id: I5831d4ad80b7f60d8782fffd6c64ef552f82ad6e
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
This commit is contained in:
Thiago Macieira 2025-06-11 10:15:04 -07:00
parent d91d49ffe2
commit 4f0156fa4b
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/corelib/thread/qmutex.h
View File

@ -19,7 +19,7 @@ class QMutex;
class QRecursiveMutex; class QRecursiveMutex;
class QMutexPrivate; class QMutexPrivate;
class Q_CORE_EXPORT QBasicMutex class QT6_ONLY(Q_CORE_EXPORT) QBasicMutex
{ {
Q_DISABLE_COPY_MOVE(QBasicMutex) Q_DISABLE_COPY_MOVE(QBasicMutex)
protected: protected:
@ -94,17 +94,22 @@ private:
} }
#endif #endif
QT7_ONLY(Q_CORE_EXPORT)
void lockInternal() noexcept(FutexAlwaysAvailable); void lockInternal() noexcept(FutexAlwaysAvailable);
QT7_ONLY(Q_CORE_EXPORT)
bool lockInternal(QDeadlineTimer timeout) noexcept(FutexAlwaysAvailable); bool lockInternal(QDeadlineTimer timeout) noexcept(FutexAlwaysAvailable);
#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) #if QT_VERSION < QT_VERSION_CHECK(7, 0, 0)
bool lockInternal(int timeout) noexcept(FutexAlwaysAvailable); bool lockInternal(int timeout) noexcept(FutexAlwaysAvailable);
void unlockInternal() noexcept; void unlockInternal() noexcept;
#endif #endif
QT7_ONLY(Q_CORE_EXPORT)
void unlockInternalFutex(void *d) noexcept; void unlockInternalFutex(void *d) noexcept;
QT7_ONLY(Q_CORE_EXPORT)
void unlockInternal(void *d) noexcept; void unlockInternal(void *d) noexcept;
#if QT_CORE_REMOVED_SINCE(6, 9) #if QT_CORE_REMOVED_SINCE(6, 9)
void destroyInternal(QMutexPrivate *d); void destroyInternal(QMutexPrivate *d);
#endif #endif
QT7_ONLY(Q_CORE_EXPORT)
void destroyInternal(void *d); void destroyInternal(void *d);
QBasicAtomicPointer<QMutexPrivate> d_ptr; QBasicAtomicPointer<QMutexPrivate> d_ptr;
@ -116,7 +121,7 @@ private:
friend class QMutexPrivate; friend class QMutexPrivate;
}; };
class Q_CORE_EXPORT QMutex : public QBasicMutex class QT6_ONLY(Q_CORE_EXPORT) QMutex : public QBasicMutex
{ {
public: public:
constexpr QMutex() = default; constexpr QMutex() = default;
@ -179,7 +184,7 @@ public:
} }
}; };
class Q_CORE_EXPORT QRecursiveMutex class QT6_ONLY(Q_CORE_EXPORT) QRecursiveMutex
{ {
Q_DISABLE_COPY_MOVE(QRecursiveMutex) Q_DISABLE_COPY_MOVE(QRecursiveMutex)
// written to by the thread that first owns 'mutex'; // written to by the thread that first owns 'mutex';
@ -192,6 +197,7 @@ class Q_CORE_EXPORT QRecursiveMutex
public: public:
constexpr QRecursiveMutex() = default; constexpr QRecursiveMutex() = default;
QT7_ONLY(Q_CORE_EXPORT)
~QRecursiveMutex(); ~QRecursiveMutex();
@ -200,8 +206,10 @@ public:
{ tryLock(QDeadlineTimer(QDeadlineTimer::Forever)); } { tryLock(QDeadlineTimer(QDeadlineTimer::Forever)); }
QT_CORE_INLINE_SINCE(6, 6) QT_CORE_INLINE_SINCE(6, 6)
bool tryLock(int timeout) noexcept(LockIsNoexcept); bool tryLock(int timeout) noexcept(LockIsNoexcept);
QT7_ONLY(Q_CORE_EXPORT)
bool tryLock(QDeadlineTimer timer = {}) noexcept(LockIsNoexcept); bool tryLock(QDeadlineTimer timer = {}) noexcept(LockIsNoexcept);
// BasicLockable concept // BasicLockable concept
QT7_ONLY(Q_CORE_EXPORT)
void unlock() noexcept; void unlock() noexcept;
// Lockable concept // Lockable concept