Merge QReadWriteLock constructor overloads per Qt 5 comment.

Change-Id: I3b569b1240a0bc5b2589de353dbf62c175472448
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

2 files changed, 3 insertions, 11 deletions

diff --git a/src/corelib/thread/qreadwritelock.cpp b/src/corelib/thread/qreadwritelock.cpp
index f552e6f6d6..b3f791589e 100644
--- a/src/corelib/thread/qreadwritelock.cpp
+++ b/src/corelib/thread/qreadwritelock.cpp
@@ -107,19 +107,12 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    Constructs a QReadWriteLock object in NonRecursive mode.
-
-    \sa lockForRead(), lockForWrite()
-*/
-QReadWriteLock::QReadWriteLock()
-    :d(new QReadWriteLockPrivate(NonRecursive))
-{ }
-
-/*!
     \since 4.4
 
     Constructs a QReadWriteLock object in the given \a recursionMode.
 
+    The default recursion mode is NonRecursive.
+
     \sa lockForRead(), lockForWrite(), RecursionMode
 */
 QReadWriteLock::QReadWriteLock(RecursionMode recursionMode)
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();