diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2014-04-02 19:44:23 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-02 21:03:04 +0200 |
| commit | 440861bf098e7e0407b3d5ca6a50138cfb445c08 (patch) | |
| tree | fd408ea03c234dc0c731ed380c88fcae6832a6c4 /src/3rdparty | |
| parent | babc7560f3172ec91b5d8c374f6039ef2e1fe363 (diff) | |
Fix builds with namespaced Qt
Change-Id: I15a4a472f5283c56c8185b05699e33368c45ddb0
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/threadweaver/src/job.h | 2 | ||||
| -rw-r--r-- | src/3rdparty/threadweaver/src/jobinterface.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/3rdparty/threadweaver/src/job.h b/src/3rdparty/threadweaver/src/job.h index b573f990d..3a50af580 100644 --- a/src/3rdparty/threadweaver/src/job.h +++ b/src/3rdparty/threadweaver/src/job.h @@ -33,8 +33,10 @@ $Id: Job.h 32 2005-08-17 08:38:01Z mirko $ #include "jobinterface.h" #include "jobpointer.h" +QT_BEGIN_NAMESPACE class QMutex; class QWaitCondition; +QT_END_NAMESPACE namespace ThreadWeaver { diff --git a/src/3rdparty/threadweaver/src/jobinterface.h b/src/3rdparty/threadweaver/src/jobinterface.h index dc95f61f0..2a78182d0 100644 --- a/src/3rdparty/threadweaver/src/jobinterface.h +++ b/src/3rdparty/threadweaver/src/jobinterface.h @@ -32,7 +32,9 @@ #include "threadweaver_export.h" #include "jobpointer.h" +QT_BEGIN_NAMESPACE class QMutex; +QT_END_NAMESPACE namespace ThreadWeaver { |