diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2020-01-24 14:11:53 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2020-01-27 13:03:18 +0100 |
| commit | 406f15ce0e2707452462ff73b2d660ece960623f (patch) | |
| tree | e3878091bff1d9fc78b1dc6b7887b4e3cbbc8d60 /src/quick/scenegraph/compressedtexture | |
| parent | 936811f91edb873250d67d27203f24535c102122 (diff) | |
Quick: Don't qualify OpenGL includes
The headers are moving from QtGui to QtOpenGL. By avoiding the
qualification we can keep them compiling either way. Also, add
opengl-private to make the types available.
Also removed the QGraphicsRotation hack to get access to the projected
rotation function of QMatrix4x4. The function is public now.
Task-number: QTBUG-74409
Change-Id: I216e8ca09f8e247f96627b081308e3a57c55c29c
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/quick/scenegraph/compressedtexture')
| -rw-r--r-- | src/quick/scenegraph/compressedtexture/qsgcompressedatlastexture.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quick/scenegraph/compressedtexture/qsgcompressedatlastexture.cpp b/src/quick/scenegraph/compressedtexture/qsgcompressedatlastexture.cpp index 46b2c6386c..b59d490250 100644 --- a/src/quick/scenegraph/compressedtexture/qsgcompressedatlastexture.cpp +++ b/src/quick/scenegraph/compressedtexture/qsgcompressedatlastexture.cpp @@ -43,13 +43,13 @@ #include <QtCore/QElapsedTimer> #include <QtCore/QtMath> -#include <QtGui/QOpenGLContext> +#include <QOpenGLContext> #include <QtGui/QGuiApplication> #include <QtGui/QScreen> #include <QtGui/QSurface> #include <QtGui/QWindow> -#include <QtGui/QOpenGLFunctions> -#include <QtGui/QOpenGLTexture> +#include <QOpenGLFunctions> +#include <QOpenGLTexture> #include <QDebug> #include <private/qqmlglobal_p.h> |