diff options
author | Mike Krus <mike.krus@kdab.com> | 2020-02-03 16:39:14 +0000 |
---|---|---|
committer | Mike Krus <mike.krus@kdab.com> | 2020-02-06 05:24:18 +0000 |
commit | 0159963cf5072e05d068fd7a9b58085ac70021c1 (patch) | |
tree | ba63ca0d4e314fad1d28b9fda5902b1df15200cb | |
parent | 64457740e0da484c79826e6b8286851e6aa8df1f (diff) | |
download | qt3d-0159963cf5072e05d068fd7a9b58085ac70021c1.tar.gz |
Remove QtGui module path from OpenGL related paths
Many are moving to opengl module in qt6, will make merging
easier.
Change-Id: I0ad08510e6999a5d887d9197fe2cb0dc21919fb9
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
-rw-r--r-- | examples/qt3d/audio-visualizer-qml/main.cpp | 2 | ||||
-rw-r--r-- | src/animation/backend/gltfimporter.cpp | 2 | ||||
-rw-r--r-- | src/extras/defaults/qt3dwindow.cpp | 2 | ||||
-rw-r--r-- | src/plugins/geometryloaders/gltf/gltfgeometryloader.cpp | 2 | ||||
-rw-r--r-- | src/plugins/renderers/opengl/textures/renderbuffer.cpp | 4 | ||||
-rw-r--r-- | src/quick3d/imports/scene3d/scene3drenderer.cpp | 4 | ||||
-rw-r--r-- | src/quick3d/imports/scene3d/scene3dsgmaterialshader.cpp | 4 | ||||
-rw-r--r-- | src/quick3d/quick3dextras/qt3dquickwindow.cpp | 2 | ||||
-rw-r--r-- | src/render/backend/abstractrenderer_p.h | 2 | ||||
-rw-r--r-- | src/render/geometry/gltfskeletonloader.cpp | 2 | ||||
-rw-r--r-- | src/render/texture/qtextureimagedata.h | 2 | ||||
-rw-r--r-- | tests/auto/extras/qcuboidgeometry/tst_qcuboidgeometry.cpp | 2 | ||||
-rw-r--r-- | tests/auto/extras/qtorusgeometry/tst_qtorusgeometry.cpp | 2 | ||||
-rw-r--r-- | tests/auto/render/qgraphicsapifilter/tst_qgraphicsapifilter.cpp | 2 |
14 files changed, 17 insertions, 17 deletions
diff --git a/examples/qt3d/audio-visualizer-qml/main.cpp b/examples/qt3d/audio-visualizer-qml/main.cpp index c3fe2c009..5759dfe71 100644 --- a/examples/qt3d/audio-visualizer-qml/main.cpp +++ b/examples/qt3d/audio-visualizer-qml/main.cpp @@ -50,7 +50,7 @@ #include "touchsettings.h" #include <QtGui/QGuiApplication> -#include <QtGui/QOpenGLContext> +#include <QOpenGLContext> #include <QtQuick/QQuickView> #include <QtQuick/QQuickItem> #include <QtQml/QQmlContext> diff --git a/src/animation/backend/gltfimporter.cpp b/src/animation/backend/gltfimporter.cpp index a5127efd0..f7907b3c2 100644 --- a/src/animation/backend/gltfimporter.cpp +++ b/src/animation/backend/gltfimporter.cpp @@ -42,7 +42,7 @@ #include <Qt3DAnimation/private/fcurve_p.h> #include <Qt3DAnimation/private/keyframe_p.h> -#include <QtGui/qopengl.h> +#include <qopengl.h> #include <QtGui/qquaternion.h> #include <QtGui/qvector2d.h> #include <QtGui/qvector3d.h> diff --git a/src/extras/defaults/qt3dwindow.cpp b/src/extras/defaults/qt3dwindow.cpp index 04b8554f1..f555308a6 100644 --- a/src/extras/defaults/qt3dwindow.cpp +++ b/src/extras/defaults/qt3dwindow.cpp @@ -60,7 +60,7 @@ #include <Qt3DInput/qinputsettings.h> #include <Qt3DLogic/qlogicaspect.h> #include <Qt3DRender/qcamera.h> -#include <QtGui/qopenglcontext.h> +#include <qopenglcontext.h> #include <private/qrendersettings_p.h> #include <QEvent> diff --git a/src/plugins/geometryloaders/gltf/gltfgeometryloader.cpp b/src/plugins/geometryloaders/gltf/gltfgeometryloader.cpp index 8adb70f96..2c8bb14c3 100644 --- a/src/plugins/geometryloaders/gltf/gltfgeometryloader.cpp +++ b/src/plugins/geometryloaders/gltf/gltfgeometryloader.cpp @@ -44,7 +44,7 @@ #include <QtCore/QJsonObject> #include <QtCore/QVersionNumber> -#include <QtGui/QOpenGLTexture> +#include <QOpenGLTexture> #include <Qt3DRender/QGeometry> #include <Qt3DRender/private/renderlogging_p.h> diff --git a/src/plugins/renderers/opengl/textures/renderbuffer.cpp b/src/plugins/renderers/opengl/textures/renderbuffer.cpp index 330e29472..05d6bd1fa 100644 --- a/src/plugins/renderers/opengl/textures/renderbuffer.cpp +++ b/src/plugins/renderers/opengl/textures/renderbuffer.cpp @@ -38,8 +38,8 @@ ****************************************************************************/ #include "renderbuffer_p.h" -#include <QtGui/QOpenGLContext> -#include <QtGui/QOpenGLFunctions> +#include <QOpenGLContext> +#include <QOpenGLFunctions> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/imports/scene3d/scene3drenderer.cpp b/src/quick3d/imports/scene3d/scene3drenderer.cpp index fafeeedf4..71cf6c240 100644 --- a/src/quick3d/imports/scene3d/scene3drenderer.cpp +++ b/src/quick3d/imports/scene3d/scene3drenderer.cpp @@ -42,8 +42,8 @@ #include <Qt3DCore/qaspectengine.h> #include <Qt3DRender/qrenderaspect.h> #include <QtCore/qthread.h> -#include <QtGui/qopenglcontext.h> -#include <QtGui/qopenglframebufferobject.h> +#include <qopenglcontext.h> +#include <qopenglframebufferobject.h> #include <QtQuick/qquickwindow.h> #include <Qt3DRender/private/qrenderaspect_p.h> diff --git a/src/quick3d/imports/scene3d/scene3dsgmaterialshader.cpp b/src/quick3d/imports/scene3d/scene3dsgmaterialshader.cpp index cfe39e8c7..b7dd03810 100644 --- a/src/quick3d/imports/scene3d/scene3dsgmaterialshader.cpp +++ b/src/quick3d/imports/scene3d/scene3dsgmaterialshader.cpp @@ -39,8 +39,8 @@ #include "scene3dsgmaterialshader_p.h" -#include <QtGui/qopenglcontext.h> -#include <QtGui/qopenglfunctions.h> +#include <qopenglcontext.h> +#include <qopenglfunctions.h> #include <QtGui/qsurfaceformat.h> #include <scene3dsgmaterial_p.h> diff --git a/src/quick3d/quick3dextras/qt3dquickwindow.cpp b/src/quick3d/quick3dextras/qt3dquickwindow.cpp index 043aca8b9..dfe245936 100644 --- a/src/quick3d/quick3dextras/qt3dquickwindow.cpp +++ b/src/quick3d/quick3dextras/qt3dquickwindow.cpp @@ -60,7 +60,7 @@ #include <Qt3DRender/qrendersurfaceselector.h> #include <QtGui/QGuiApplication> #include <QtGui/QScreen> -#include <QtGui/qopenglcontext.h> +#include <qopenglcontext.h> #include <QtQml/QQmlContext> #include <QtQml/qqmlincubator.h> diff --git a/src/render/backend/abstractrenderer_p.h b/src/render/backend/abstractrenderer_p.h index 3febf691e..4e25d627f 100644 --- a/src/render/backend/abstractrenderer_p.h +++ b/src/render/backend/abstractrenderer_p.h @@ -58,7 +58,7 @@ #include <Qt3DCore/qnodeid.h> #include <QtGui/qsurfaceformat.h> -#include <QtGui/qopenglcontext.h> +#include <qopenglcontext.h> QT_BEGIN_NAMESPACE diff --git a/src/render/geometry/gltfskeletonloader.cpp b/src/render/geometry/gltfskeletonloader.cpp index 07789cd84..d5d344ce1 100644 --- a/src/render/geometry/gltfskeletonloader.cpp +++ b/src/render/geometry/gltfskeletonloader.cpp @@ -36,7 +36,7 @@ #include "gltfskeletonloader_p.h" -#include <QtGui/qopengl.h> +#include <qopengl.h> #include <QtCore/qdir.h> #include <QtCore/qfile.h> #include <QtCore/qfileinfo.h> diff --git a/src/render/texture/qtextureimagedata.h b/src/render/texture/qtextureimagedata.h index 68ceebabc..5bc71480e 100644 --- a/src/render/texture/qtextureimagedata.h +++ b/src/render/texture/qtextureimagedata.h @@ -40,7 +40,7 @@ #ifndef QT3DRENDER_TEXTUREIMAGEDATA_H #define QT3DRENDER_TEXTUREIMAGEDATA_H -#include <QtGui/QOpenGLTexture> +#include <QOpenGLTexture> #include <QtGui/QImage> #include <QtCore/QSharedPointer> #include <Qt3DRender/qt3drender_global.h> diff --git a/tests/auto/extras/qcuboidgeometry/tst_qcuboidgeometry.cpp b/tests/auto/extras/qcuboidgeometry/tst_qcuboidgeometry.cpp index 973a1d613..838e5dea9 100644 --- a/tests/auto/extras/qcuboidgeometry/tst_qcuboidgeometry.cpp +++ b/tests/auto/extras/qcuboidgeometry/tst_qcuboidgeometry.cpp @@ -32,7 +32,7 @@ #include <Qt3DRender/qattribute.h> #include <Qt3DRender/qbuffer.h> #include <Qt3DRender/qbufferdatagenerator.h> -#include <QtGui/qopenglcontext.h> +#include <qopenglcontext.h> #include <QtGui/qvector2d.h> #include <QtGui/qvector3d.h> #include <QtGui/qvector4d.h> diff --git a/tests/auto/extras/qtorusgeometry/tst_qtorusgeometry.cpp b/tests/auto/extras/qtorusgeometry/tst_qtorusgeometry.cpp index 28fe76ae9..bf5651c9c 100644 --- a/tests/auto/extras/qtorusgeometry/tst_qtorusgeometry.cpp +++ b/tests/auto/extras/qtorusgeometry/tst_qtorusgeometry.cpp @@ -32,7 +32,7 @@ #include <Qt3DRender/qattribute.h> #include <Qt3DRender/qbuffer.h> #include <Qt3DRender/qbufferdatagenerator.h> -#include <QtGui/qopenglcontext.h> +#include <qopenglcontext.h> #include <QtGui/qvector2d.h> #include <QtGui/qvector3d.h> #include <QtGui/qvector4d.h> diff --git a/tests/auto/render/qgraphicsapifilter/tst_qgraphicsapifilter.cpp b/tests/auto/render/qgraphicsapifilter/tst_qgraphicsapifilter.cpp index bbc5219f8..ea14c27bb 100644 --- a/tests/auto/render/qgraphicsapifilter/tst_qgraphicsapifilter.cpp +++ b/tests/auto/render/qgraphicsapifilter/tst_qgraphicsapifilter.cpp @@ -29,7 +29,7 @@ #include <QtTest/QTest> #include <QObject> #include <Qt3DRender/qgraphicsapifilter.h> -#include <QtGui/qopenglcontext.h> +#include <qopenglcontext.h> #include <QtCore/qsharedpointer.h> #include <QSignalSpy> |