diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-02-10 09:23:22 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-02-10 12:12:04 +0100 |
| commit | 772d8d3dc775f3e76f0dbb627b4bf96591ca10a4 (patch) | |
| tree | 02b05ef84eb05defd7b5846067667e12bbd8b663 | |
| parent | 10411f69b9f08b882c71aaf77c81531d21eaa750 (diff) | |
Restore include of QOpenGLTexture for Qt 5 in public headerv5.15.0-alpha1
The module path needs to be specified for Qt for Python to build.
Amends 0159963cf5072e05d068fd7a9b58085ac70021c1.
Change-Id: I5b030752cbe321d293985167e665cdcdc0c4c230
Reviewed-by: Mike Krus <mike.krus@kdab.com>
| -rw-r--r-- | src/render/texture/qtextureimagedata.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/render/texture/qtextureimagedata.h b/src/render/texture/qtextureimagedata.h index 5bc71480e..8daf1becb 100644 --- a/src/render/texture/qtextureimagedata.h +++ b/src/render/texture/qtextureimagedata.h @@ -40,10 +40,14 @@ #ifndef QT3DRENDER_TEXTUREIMAGEDATA_H #define QT3DRENDER_TEXTUREIMAGEDATA_H -#include <QOpenGLTexture> +#include <Qt3DRender/qt3drender_global.h> +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +# include <QOpenGLTexture> +#else +# include <QtGui/qopengltexture.h> +#endif #include <QtGui/QImage> #include <QtCore/QSharedPointer> -#include <Qt3DRender/qt3drender_global.h> QT_BEGIN_NAMESPACE |