diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2011-10-07 12:45:47 (GMT) |
|---|---|---|
| committer | Jan-Arve Saether <jan-arve.saether@nokia.com> | 2011-10-07 12:45:47 (GMT) |
| commit | 1e8479b2aa781e6ce3fadf01294023fbc6ddbc22 (patch) | |
| tree | f71430dfeddf810ab06ad496c3a31334537071ad /src/corelib/kernel | |
| parent | a0feeef52efde872c6d6e458c8e15616da0bf74f (diff) | |
| download | Qt-1e8479b2aa781e6ce3fadf01294023fbc6ddbc22.zip Qt-1e8479b2aa781e6ce3fadf01294023fbc6ddbc22.tar.gz Qt-1e8479b2aa781e6ce3fadf01294023fbc6ddbc22.tar.bz2 | |
don't lock the global mutex if there is nothing to protect
according to Thiago, setting the pointer with the same values *is* thread-safe
Merge-request: 2655
Reviewed-by: Jan-Arve Saether <jan-arve.saether@nokia.com>
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qeventdispatcher_win.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/corelib/kernel/qeventdispatcher_win.cpp b/src/corelib/kernel/qeventdispatcher_win.cpp index 365b28e..c135c4a 100644 --- a/src/corelib/kernel/qeventdispatcher_win.cpp +++ b/src/corelib/kernel/qeventdispatcher_win.cpp @@ -53,7 +53,6 @@ #include "qabstracteventdispatcher_p.h" #include "qcoreapplication_p.h" #include <private/qthread_p.h> -#include <private/qmutexpool_p.h> QT_BEGIN_NAMESPACE @@ -322,11 +321,6 @@ static void resolveTimerAPI() { static bool triedResolve = false; if (!triedResolve) { -#ifndef QT_NO_THREAD - QMutexLocker locker(QMutexPool::globalInstanceGet(&triedResolve)); - if (triedResolve) - return; -#endif #ifndef Q_OS_WINCE QSystemLibrary library(QLatin1String("Mmtimer")); #else |