diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-04-19 16:11:12 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-12 16:57:57 (GMT) |
| commit | e9ff4a5d3f01ce0e107a1f797446b92a6e52fc0e (patch) | |
| tree | 8168a2f8b6a6d200b51e77e9ae9ab1f3cb5455be | |
| parent | f7efbae117595c2503ca85bfca7f27e0b6a92328 (diff) | |
| download | Qt-e9ff4a5d3f01ce0e107a1f797446b92a6e52fc0e.zip Qt-e9ff4a5d3f01ce0e107a1f797446b92a6e52fc0e.tar.gz Qt-e9ff4a5d3f01ce0e107a1f797446b92a6e52fc0e.tar.bz2 | |
fix namespaced build
Change-Id: I9d0a3cb08de5e91807da7f0358c83b6693ebd1ea
Reviewed-by: hjk <hjk121@nokiamail.com>
(cherry picked from qtbase/da55d48ad731ee2499467b3e93e11eb3b53df89d)
| -rw-r--r-- | src/corelib/thread/qorderedmutexlocker_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/thread/qorderedmutexlocker_p.h b/src/corelib/thread/qorderedmutexlocker_p.h index 81812bb..93aa9ac 100644 --- a/src/corelib/thread/qorderedmutexlocker_p.h +++ b/src/corelib/thread/qorderedmutexlocker_p.h @@ -53,10 +53,10 @@ // We mean it. // -QT_BEGIN_NAMESPACE - #include <QtCore/qmutex.h> +QT_BEGIN_NAMESPACE + /* Locks 2 mutexes in a defined order, avoiding a recursive lock if we're trying to lock the same mutex twice. |