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 /src/render | |
parent | 64457740e0da484c79826e6b8286851e6aa8df1f (diff) |
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>
Diffstat (limited to 'src/render')
-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 |
3 files changed, 3 insertions, 3 deletions
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> |