diff options
| author | Robin Burchell <robin.burchell@collabora.com> | 2011-12-20 18:28:49 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-20 20:47:13 +0100 |
| commit | e5f84ebf010907a3eaa90546966b4929dfd894fa (patch) | |
| tree | 5ab9efcf7b13bd600cacf61f5916b3d456b39819 /src/corelib/thread/qreadwritelock.h | |
| parent | 341b62d3080c9ab745b25a0e985bbdedf5754117 (diff) | |
Merge QReadWriteLock constructor overloads per Qt 5 comment.
Change-Id: I3b569b1240a0bc5b2589de353dbf62c175472448
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/thread/qreadwritelock.h')
| -rw-r--r-- | src/corelib/thread/qreadwritelock.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/corelib/thread/qreadwritelock.h b/src/corelib/thread/qreadwritelock.h index 7bb6329522..c369e20d90 100644 --- a/src/corelib/thread/qreadwritelock.h +++ b/src/corelib/thread/qreadwritelock.h @@ -60,8 +60,7 @@ class Q_CORE_EXPORT QReadWriteLock public: enum RecursionMode { NonRecursive, Recursive }; - QReadWriteLock(); // ### Qt 5: merge with below - QReadWriteLock(RecursionMode recursionMode); + explicit QReadWriteLock(RecursionMode recursionMode = NonRecursive); ~QReadWriteLock(); void lockForRead(); |