diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:09:44 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:10:02 +0100 |
| commit | 77d294db076dac19e8b549b445ffede9f7260c84 (patch) | |
| tree | 828ee7a6862ec5c0bd24f97cb540625a2c647376 /src/core/qchangearbiter.cpp | |
| parent | 59f8fec8a41606b3185fe3a4e276978e3e1ed5ef (diff) | |
| parent | 939b9b4b7591e8a421cf048a0a84ed3e75d81d21 (diff) | |
Merge branch 'dev' into wip/animationwip/animation
Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f
Diffstat (limited to 'src/core/qchangearbiter.cpp')
| -rw-r--r-- | src/core/qchangearbiter.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/core/qchangearbiter.cpp b/src/core/qchangearbiter.cpp index a7ca3ed40..d6c7e05df 100644 --- a/src/core/qchangearbiter.cpp +++ b/src/core/qchangearbiter.cpp @@ -38,17 +38,18 @@ ****************************************************************************/ #include "qchangearbiter_p.h" -#include "qcomponent.h" -#include "qabstractaspectjobmanager_p.h" -#include "qsceneobserverinterface_p.h" -#include <Qt3DCore/private/qscene_p.h> +#include <Qt3DCore/qcomponent.h> +#include <QtCore/QMutexLocker> +#include <QtCore/QReadLocker> +#include <QtCore/QThread> +#include <QtCore/QWriteLocker> + #include <Qt3DCore/private/corelogging_p.h> -#include <QMutexLocker> -#include <QReadLocker> -#include <QThread> -#include <QWriteLocker> -#include <private/qpostman_p.h> +#include <Qt3DCore/private/qabstractaspectjobmanager_p.h> +#include <Qt3DCore/private/qpostman_p.h> +#include <Qt3DCore/private/qscene_p.h> +#include <Qt3DCore/private/qsceneobserverinterface_p.h> QT_BEGIN_NAMESPACE |