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/items/context2d | |
| 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/items/context2d')
| -rw-r--r-- | src/quick/items/context2d/qquickcontext2dcommandbuffer.cpp | 4 | ||||
| -rw-r--r-- | src/quick/items/context2d/qquickcontext2dtexture.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/quick/items/context2d/qquickcontext2dcommandbuffer.cpp b/src/quick/items/context2d/qquickcontext2dcommandbuffer.cpp index 55ebbe907c..73b52d0c73 100644 --- a/src/quick/items/context2d/qquickcontext2dcommandbuffer.cpp +++ b/src/quick/items/context2d/qquickcontext2dcommandbuffer.cpp @@ -44,8 +44,8 @@ #include <QtQuick/qsgtexture.h> #include <QtGui/QPaintEngine> #if QT_CONFIG(opengl) -# include <QtGui/QOpenGLContext> -# include <QtGui/private/qopenglpaintengine_p.h> +# include <QOpenGLContext> +# include <private/qopenglpaintengine_p.h> #endif #define HAS_SHADOW(offsetX, offsetY, blur, color) (color.isValid() && color.alpha() && (blur || offsetX || offsetY)) diff --git a/src/quick/items/context2d/qquickcontext2dtexture.cpp b/src/quick/items/context2d/qquickcontext2dtexture.cpp index 0ebd1a66c9..1cf3891488 100644 --- a/src/quick/items/context2d/qquickcontext2dtexture.cpp +++ b/src/quick/items/context2d/qquickcontext2dtexture.cpp @@ -43,12 +43,12 @@ #include <private/qquickitem_p.h> #include <QtQuick/private/qsgplaintexture_p.h> #include "qquickcontext2dcommandbuffer_p.h" -#include <QOpenGLPaintDevice> #if QT_CONFIG(opengl) +#include <QOpenGLPaintDevice> #include <QOpenGLFramebufferObject> #include <QOpenGLFramebufferObjectFormat> #include <QOpenGLFunctions> -#include <QtGui/private/qopenglextensions_p.h> +#include <private/qopenglextensions_p.h> #endif #include <QtCore/QThread> #include <QtGui/QGuiApplication> |