diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2017-04-02 10:48:27 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2017-04-02 11:15:29 +0100 |
commit | f7934f67f7ca833182ac288bdcb61e0141dfbd84 (patch) | |
tree | 09b410ecfc7c8f114e2f994796dc41edf636476a /src/quick3d/quick3dextras | |
parent | 3e664bf438d4a3ab9a5f1633f2db171632b777b8 (diff) | |
parent | c64df4a307aff064433f57805561cb445c0e285f (diff) |
Merge branch '5.8' into 5.9
Conflicts:
src/core/jobs/qthreadpooler.cpp
src/core/nodes/qcomponent.cpp
src/core/qpostman.cpp
src/core/qscene_p.h
src/core/services/qservicelocator_p.h
src/input/frontend/qinputaspect.cpp
src/plugins/sceneparsers/assimp/assimpimporter.cpp
src/plugins/sceneparsers/assimp/assimpimporter.h
src/plugins/sceneparsers/gltf/gltfimporter.h
src/plugins/sceneparsers/gltf/gltfio.cpp
src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp
src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp
src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
src/quick3d/quick3dextras/qt3dquickwindow.cpp
Change-Id: I3566708c6f74a34959e7bb64b64e93647ca3f699
Diffstat (limited to 'src/quick3d/quick3dextras')
-rw-r--r-- | src/quick3d/quick3dextras/qt3dquickwindow.cpp | 22 | ||||
-rw-r--r-- | src/quick3d/quick3dextras/qt3dquickwindow.h | 4 |
2 files changed, 13 insertions, 13 deletions
diff --git a/src/quick3d/quick3dextras/qt3dquickwindow.cpp b/src/quick3d/quick3dextras/qt3dquickwindow.cpp index 7fecf0d46..7f32f03f0 100644 --- a/src/quick3d/quick3dextras/qt3dquickwindow.cpp +++ b/src/quick3d/quick3dextras/qt3dquickwindow.cpp @@ -49,22 +49,22 @@ ****************************************************************************/ #include <Qt3DQuickExtras/qt3dquickwindow.h> -#include <Qt3DQuickExtras/private/qt3dquickwindowlogging_p.h> #include <Qt3DQuick/QQmlAspectEngine> -#include <Qt3DRender/qcamera.h> -#include <Qt3DRender/qrenderaspect.h> -#include <Qt3DRender/qrendersurfaceselector.h> -#include <Qt3DRender/private/qrendersurfaceselector_p.h> +#include <Qt3DQuickExtras/qt3dquickwindow.h> #include <Qt3DInput/qinputaspect.h> #include <Qt3DInput/qinputsettings.h> #include <Qt3DLogic/qlogicaspect.h> - -#include <QQmlContext> -#include <qqmlincubator.h> -#include <QGuiApplication> -#include <QScreen> - +#include <Qt3DRender/qcamera.h> +#include <Qt3DRender/qrenderaspect.h> +#include <Qt3DRender/qrendersurfaceselector.h> +#include <QtGui/QGuiApplication> +#include <QtGui/QScreen> #include <QtGui/qopenglcontext.h> +#include <QtQml/QQmlContext> +#include <QtQml/qqmlincubator.h> + +#include <Qt3DQuickExtras/private/qt3dquickwindowlogging_p.h> +#include <Qt3DRender/private/qrendersurfaceselector_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3dextras/qt3dquickwindow.h b/src/quick3d/quick3dextras/qt3dquickwindow.h index a8703093e..1b4d3fabf 100644 --- a/src/quick3d/quick3dextras/qt3dquickwindow.h +++ b/src/quick3d/quick3dextras/qt3dquickwindow.h @@ -52,9 +52,9 @@ #define QT3DEXTRAS_QUICK_QT3DQUICKWINDOW_H #include <Qt3DQuickExtras/qt3dquickextras_global.h> -#include <QQuickWindow> +#include <QtCore/QUrl> #include <QtCore/qpointer.h> -#include <QUrl> +#include <QtQuick/QQuickWindow> QT_BEGIN_NAMESPACE |