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_p.h | |
| parent | 59f8fec8a41606b3185fe3a4e276978e3e1ed5ef (diff) | |
| parent | 939b9b4b7591e8a421cf048a0a84ed3e75d81d21 (diff) | |
Merge branch 'dev' into wip/animationwip/animation
Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f
Diffstat (limited to 'src/core/qchangearbiter_p.h')
| -rw-r--r-- | src/core/qchangearbiter_p.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/core/qchangearbiter_p.h b/src/core/qchangearbiter_p.h index e381abc65..54ef6a207 100644 --- a/src/core/qchangearbiter_p.h +++ b/src/core/qchangearbiter_p.h @@ -51,16 +51,17 @@ // We mean it. // -#include <QObject> -#include <QFlags> -#include <QReadWriteLock> -#include <QVariant> -#include <QVector> -#include <QPair> -#include <QThreadStorage> -#include <QMutex> #include <Qt3DCore/qnodeid.h> #include <Qt3DCore/qscenechange.h> +#include <QtCore/QFlags> +#include <QtCore/QMutex> +#include <QtCore/QObject> +#include <QtCore/QPair> +#include <QtCore/QReadWriteLock> +#include <QtCore/QThreadStorage> +#include <QtCore/QVariant> +#include <QtCore/QVector> + #include <Qt3DCore/private/qlockableobserverinterface_p.h> #include <Qt3DCore/private/qt3dcore_global_p.h> |