Merge "Merge remote-tracking branch 'origin/5.7' into dev" into refs/staging/dev

1 files changed, 6 insertions, 0 deletions

diff --git a/src/corelib/thread/qreadwritelock.cpp b/src/corelib/thread/qreadwritelock.cpp
index 5665bf74f6..6302a3a515 100644
--- a/src/corelib/thread/qreadwritelock.cpp
+++ b/src/corelib/thread/qreadwritelock.cpp
@@ -244,6 +244,9 @@ bool QReadWriteLock::tryLockForRead(int timeout)
         }
 
         if (d == dummyLockedForWrite) {
+            if (!timeout)
+                return false;
+
             // locked for write, assign a d_ptr and wait.
             auto val = QReadWriteLockPrivate::allocate();
             val->writerCount = 1;
@@ -345,6 +348,9 @@ bool QReadWriteLock::tryLockForWrite(int timeout)
         }
 
         if (isUncontendedLocked(d)) {
+            if (!timeout)
+                return false;
+
             // locked for either read or write, assign a d_ptr and wait.
             auto val = QReadWriteLockPrivate::allocate();
             if (d == dummyLockedForWrite)