AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QReadWriteLock: don't mark fully-inline classes as exported

Browse Source 
We can't remove the export in Qt 6 because of how MSVC ABI works. In all
other compilers, this change is a no-op anyway (inline functions have
hidden visibility).

Change-Id: I3d728c4197df49169066fffd1756dc377b30c504
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
This commit is contained in:
Thiago Macieira 2023-04-17 16:19:44 -07:00
parent 357ca7d90a
commit 10a850f584
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/corelib/thread/qreadwritelock.h
View File

@ -45,7 +45,7 @@ private:
#pragma warning( disable : 4312 ) // ignoring the warning from /Wp64
#endif
class Q_CORE_EXPORT QReadLocker
class QT6_ONLY(Q_CORE_EXPORT) QReadLocker
{
public:
inline QReadLocker(QReadWriteLock *readWriteLock);
@ -89,7 +89,7 @@ inline QReadLocker::QReadLocker(QReadWriteLock *areadWriteLock)
relock();
}
class Q_CORE_EXPORT QWriteLocker
class QT6_ONLY(Q_CORE_EXPORT) QWriteLocker
{
public:
inline QWriteLocker(QReadWriteLock *readWriteLock);
@ -140,7 +140,7 @@ inline QWriteLocker::QWriteLocker(QReadWriteLock *areadWriteLock)
#else // QT_CONFIG(thread)
class Q_CORE_EXPORT QReadWriteLock
class QT6_ONLY(Q_CORE_EXPORT) QReadWriteLock
{
public:
enum RecursionMode { NonRecursive, Recursive };
@ -161,7 +161,7 @@ private:
Q_DISABLE_COPY(QReadWriteLock)
};
class Q_CORE_EXPORT QReadLocker
class QT6_ONLY(Q_CORE_EXPORT) QReadLocker
{
public:
inline explicit QReadLocker(QReadWriteLock *) noexcept { }
@ -175,7 +175,7 @@ private:
Q_DISABLE_COPY(QReadLocker)
};
class Q_CORE_EXPORT QWriteLocker
class QT6_ONLY(Q_CORE_EXPORT) QWriteLocker
{
public:
inline explicit QWriteLocker(QReadWriteLock *) noexcept { }