From 406f15ce0e2707452462ff73b2d660ece960623f Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Fri, 24 Jan 2020 14:11:53 +0100
Subject: 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>
---
 src/quick/items/context2d/qquickcontext2dcommandbuffer.cpp |  4 ++--
 src/quick/items/context2d/qquickcontext2dtexture.cpp       |  4 ++--
 src/quick/items/qquickframebufferobject.cpp                |  4 ++--
 src/quick/items/qquicktranslate.cpp                        | 10 +---------
 4 files changed, 7 insertions(+), 15 deletions(-)

(limited to 'src/quick/items')

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>
diff --git a/src/quick/items/qquickframebufferobject.cpp b/src/quick/items/qquickframebufferobject.cpp
index d5550e78b6..62b982340d 100644
--- a/src/quick/items/qquickframebufferobject.cpp
+++ b/src/quick/items/qquickframebufferobject.cpp
@@ -39,8 +39,8 @@
 
 #include "qquickframebufferobject.h"
 
-#include <QtGui/QOpenGLFramebufferObject>
-#include <QtGui/QOpenGLFunctions>
+#include <QOpenGLFramebufferObject>
+#include <QOpenGLFunctions>
 #include <private/qquickitem_p.h>
 #include <private/qsgadaptationlayer_p.h>
 #include <qsgtextureprovider.h>
diff --git a/src/quick/items/qquicktranslate.cpp b/src/quick/items/qquicktranslate.cpp
index 872fe25a18..3bdcfa752e 100644
--- a/src/quick/items/qquicktranslate.cpp
+++ b/src/quick/items/qquicktranslate.cpp
@@ -434,14 +434,6 @@ void QQuickRotation::setAxis(Qt::Axis axis)
     }
 }
 
-class QGraphicsRotation {
-public:
-    static inline void projectedRotate(QMatrix4x4 *matrix, qreal angle, qreal x, qreal y, qreal z)
-    {
-        matrix->projectedRotate(angle, x, y, z);
-    }
-};
-
 void QQuickRotation::applyTo(QMatrix4x4 *matrix) const
 {
     Q_D(const QQuickRotation);
@@ -450,7 +442,7 @@ void QQuickRotation::applyTo(QMatrix4x4 *matrix) const
         return;
 
     matrix->translate(d->origin);
-    QGraphicsRotation::projectedRotate(matrix, d->angle, d->axis.x(), d->axis.y(), d->axis.z());
+    matrix->projectedRotate(d->angle, d->axis.x(), d->axis.y(), d->axis.z());
     matrix->translate(-d->origin);
 }
 
-- 
cgit v1.2.3