diff options
| author | Robert Brock <robert.brock@kdab.com> | 2017-02-06 12:12:03 +0000 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-04-01 11:23:37 +0000 |
| commit | f0e035774cafbcbd0ccd425f9b5e459a1eef4b77 (patch) | |
| tree | a22ebe4db4e1c0d391781edb8163e1947d9f06ac /src/quick3d/quick3dextras | |
| parent | d56e5ea8ad6096a5e7f5a20a8d572a721d89bf0d (diff) | |
Coding convention fix for Src/Quick3D
Reordering the header includes to comply with Qt coding conventions
Task-number: QTBUG-56185
Change-Id: I60008858a4975621b9159d909908b6bba2f98f14
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/quick3d/quick3dextras')
| -rw-r--r-- | src/quick3d/quick3dextras/qt3dquickwindow.cpp | 21 | ||||
| -rw-r--r-- | src/quick3d/quick3dextras/qt3dquickwindow.h | 4 |
2 files changed, 12 insertions, 13 deletions
diff --git a/src/quick3d/quick3dextras/qt3dquickwindow.cpp b/src/quick3d/quick3dextras/qt3dquickwindow.cpp index 8a7921d8e..0849fb661 100644 --- a/src/quick3d/quick3dextras/qt3dquickwindow.cpp +++ b/src/quick3d/quick3dextras/qt3dquickwindow.cpp @@ -48,22 +48,21 @@ ** ****************************************************************************/ -#include <Qt3DQuickExtras/qt3dquickwindow.h> +#include <Qt3DInput/qinputaspect.h> +#include <Qt3DInput/qinputsettings.h> +#include <Qt3DLogic/qlogicaspect.h> #include <Qt3DQuick/QQmlAspectEngine> +#include <Qt3DQuickExtras/qt3dquickwindow.h> #include <Qt3DRender/qcamera.h> #include <Qt3DRender/qrenderaspect.h> #include <Qt3DRender/qrendersurfaceselector.h> -#include <Qt3DRender/private/qrendersurfaceselector_p.h> -#include <Qt3DInput/qinputaspect.h> -#include <Qt3DInput/qinputsettings.h> -#include <Qt3DLogic/qlogicaspect.h> - -#include <QQmlContext> -#include <qqmlincubator.h> -#include <QGuiApplication> -#include <QScreen> - +#include <QtGui/QGuiApplication> +#include <QtGui/QScreen> #include <QtGui/qopenglcontext.h> +#include <QtQml/QQmlContext> +#include <QtQml/qqmlincubator.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 |