diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-26 15:14:18 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-10-26 15:14:18 +0000 |
| commit | f79e7c07237efcefe27d6ed5090e552cd9722e3d (patch) | |
| tree | 9a1d1ac6576e882e8a8239b0fbb29fd3ddf2e4ad /src/corelib/thread/qmutex.h | |
| parent | ea284937eaf27709e7a10a0a7b43e0bc91d4aa36 (diff) | |
| parent | fa9d12f4a20d618caedc77880459fa1af75fd50d (diff) | |
Merge "Merge remote-tracking branch 'origin/5.10' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/thread/qmutex.h')
| -rw-r--r-- | src/corelib/thread/qmutex.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/thread/qmutex.h b/src/corelib/thread/qmutex.h index f40dd3c814..541f6af546 100644 --- a/src/corelib/thread/qmutex.h +++ b/src/corelib/thread/qmutex.h @@ -251,7 +251,7 @@ class Q_CORE_EXPORT QMutex public: enum RecursionMode { NonRecursive, Recursive }; - inline explicit QMutex(RecursionMode mode = NonRecursive) Q_DECL_NOTHROW { Q_UNUSED(mode); } + inline Q_DECL_CONSTEXPR explicit QMutex(RecursionMode = NonRecursive) Q_DECL_NOTHROW { } inline void lock() Q_DECL_NOTHROW {} inline bool tryLock(int timeout = 0) Q_DECL_NOTHROW { Q_UNUSED(timeout); return true; } |