summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2015-01-30 11:10:43 +0100
committerSean Harmer <sean.harmer@kdab.com>2015-02-08 15:02:26 +0000
commit782907f3f15def5f050bb69f95575d5e3f40b61d (patch)
tree210487e58d9d4b1b50f123a937e0c293a428ec1f /src
parent993c754dcd8799e4ba24de6ef7a43c414943dcb2 (diff)
QResourcesManager: restore the relock on the LockingPolicy
Why was it removed in the first place ? Change-Id: I526c9957570f18700b9eeb7f7cd061cd642e203b Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src')
-rw-r--r--src/core/resources/qresourcemanager_p.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/core/resources/qresourcemanager_p.h b/src/core/resources/qresourcemanager_p.h
index 55c866a22..5a20a6ea0 100644
--- a/src/core/resources/qresourcemanager_p.h
+++ b/src/core/resources/qresourcemanager_p.h
@@ -60,6 +60,7 @@ struct NonLockingPolicy
{
Locker(NonLockingPolicy*) {}
void unlock() {}
+ void relock() {}
};
};
@@ -82,6 +83,11 @@ public :
m_locker.unlock();
}
+ void relock()
+ {
+ m_locker.relock();
+ }
+
private:
QMutexLocker m_locker;
};