diff options
| author | Qt CI Bot <qt_ci_bot@qt-project.org> | 2021-04-15 04:30:18 +0000 |
|---|---|---|
| committer | Qt CI Bot <qt_ci_bot@qt-project.org> | 2021-04-15 04:30:18 +0000 |
| commit | cb3db096170d3ab290ba11773f405aab1ef06ef8 (patch) | |
| tree | 29e950137e54871fcfd122bc0fb3cf0d6f4feba7 /src/corelib | |
| parent | 3556b2f7533ce1b72a0fd5705908e9d13982415e (diff) | |
| parent | d3638e18d396f1935804908da717ca5cb97f2eda (diff) | |
Merge integration refs/builds/qtci/dev/1618447824
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/thread/qmutex.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/corelib/thread/qmutex.h b/src/corelib/thread/qmutex.h index 5f3b6d1b71..8265086eb7 100644 --- a/src/corelib/thread/qmutex.h +++ b/src/corelib/thread/qmutex.h @@ -285,7 +285,7 @@ class QMutex { public: - inline constexpr explicit QMutex() noexcept { } + constexpr QMutex() noexcept { } inline void lock() noexcept {} inline bool tryLock(int timeout = 0) noexcept { Q_UNUSED(timeout); return true; } @@ -305,9 +305,6 @@ public: Q_UNUSED(timePoint); return true; } - -private: - Q_DISABLE_COPY(QMutex) }; class QRecursiveMutex : public QMutex {}; |