summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJohan Klokkhammer Helsing <johan.helsing@qt.io>2020-01-17 14:15:29 +0100
committerJohan Klokkhammer Helsing <johan.helsing@qt.io>2020-02-04 18:02:41 +0100
commitfcaa7506ba1823c5af84341ced3914ea0099b446 (patch)
tree56a68a0a640160a2d8cd3cbe66c1efef8dd22230 /src
parent35262678c31a4aea0df1516c565cf9a2e808b369 (diff)
Move QOpenGLTextureBlitter from QtGui to QtOpenGL
Task-number: QTBUG-74409 Change-Id: Ie4a3dfd01ba44715de6da71c4420fe9a95a0c242 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/gui/opengl/opengl.pri2
-rw-r--r--src/opengl/opengl.pro2
-rw-r--r--src/opengl/qopengltextureblitter.cpp (renamed from src/gui/opengl/qopengltextureblitter.cpp)4
-rw-r--r--src/opengl/qopengltextureblitter.h (renamed from src/gui/opengl/qopengltextureblitter.h)10
-rw-r--r--src/opengl/qopenglwindow.cpp2
-rw-r--r--src/platformsupport/platformcompositor/platformcompositor.pro2
-rw-r--r--src/platformsupport/platformcompositor/qopenglcompositor_p.h2
-rw-r--r--src/platformsupport/platformcompositor/qplatformbackingstoreopenglsupport.cpp3
-rw-r--r--src/plugins/platforms/wasm/qwasmcompositor.cpp1
-rw-r--r--src/plugins/platforms/wasm/qwasmcompositor.h3
10 files changed, 12 insertions, 19 deletions
diff --git a/src/gui/opengl/opengl.pri b/src/gui/opengl/opengl.pri
index f1e2019417..8d91a9e4b2 100644
--- a/src/gui/opengl/opengl.pri
+++ b/src/gui/opengl/opengl.pri
@@ -16,7 +16,6 @@ qtConfig(opengl) {
opengl/qopenglversionfunctions.h \
opengl/qopenglversionfunctionsfactory_p.h \
opengl/qopenglvertexarrayobject.h \
- opengl/qopengltextureblitter.h \
opengl/qopenglextrafunctions.h \
opengl/qopenglprogrambinarycache_p.h
@@ -28,7 +27,6 @@ qtConfig(opengl) {
opengl/qopenglversionfunctions.cpp \
opengl/qopenglversionfunctionsfactory.cpp \
opengl/qopenglvertexarrayobject.cpp \
- opengl/qopengltextureblitter.cpp \
opengl/qopenglprogrambinarycache.cpp
!qtConfig(opengles2) {
diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro
index ba9590ec07..2a5d7edbee 100644
--- a/src/opengl/opengl.pro
+++ b/src/opengl/opengl.pro
@@ -24,6 +24,7 @@ HEADERS += \
qopengltexture.h \
qopengltexture_p.h \
qopengltexturehelper_p.h \
+ qopengltextureblitter.h \
qopengltexturecache_p.h \
qopengltextureglyphcache_p.h \
qopengltextureuploader_p.h \
@@ -40,6 +41,7 @@ SOURCES += \
qopenglpixeltransferoptions.cpp \
qopengltexture.cpp \
qopengltexturehelper.cpp \
+ qopengltextureblitter.cpp \
qopengltexturecache.cpp \
qopengltextureglyphcache.cpp \
qopengltextureuploader.cpp \
diff --git a/src/gui/opengl/qopengltextureblitter.cpp b/src/opengl/qopengltextureblitter.cpp
index b709f2f639..ba2eaf7754 100644
--- a/src/gui/opengl/qopengltextureblitter.cpp
+++ b/src/opengl/qopengltextureblitter.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QtGui module of the Qt Toolkit.
+** This file is part of the QtOpenGL module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage
@@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE
\brief The QOpenGLTextureBlitter class provides a convenient way to draw textured quads via OpenGL.
\since 5.8
\ingroup painting-3D
- \inmodule QtGui
+ \inmodule QtOpenGL
Drawing textured quads, in order to get the contents of a texture
onto the screen, is a common operation when developing 2D user
diff --git a/src/gui/opengl/qopengltextureblitter.h b/src/opengl/qopengltextureblitter.h
index 2f7c6b1a0a..1818576085 100644
--- a/src/gui/opengl/qopengltextureblitter.h
+++ b/src/opengl/qopengltextureblitter.h
@@ -3,7 +3,7 @@
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QtGui module of the Qt Toolkit.
+** This file is part of the QtOpenGL module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage
@@ -40,9 +40,7 @@
#ifndef QOPENGLTEXTUREBLITTER_H
#define QOPENGLTEXTUREBLITTER_H
-#include <QtGui/qtguiglobal.h>
-
-#ifndef QT_NO_OPENGL
+#include <QtOpenGL/qtopenglglobal.h>
#include <QtGui/qopengl.h>
#include <QtGui/QMatrix3x3>
@@ -52,7 +50,7 @@ QT_BEGIN_NAMESPACE
class QOpenGLTextureBlitterPrivate;
-class Q_GUI_EXPORT QOpenGLTextureBlitter
+class Q_OPENGL_EXPORT QOpenGLTextureBlitter
{
public:
QOpenGLTextureBlitter();
@@ -89,6 +87,4 @@ private:
QT_END_NAMESPACE
-#endif
-
#endif //QOPENGLTEXTUREBLITTER_H
diff --git a/src/opengl/qopenglwindow.cpp b/src/opengl/qopenglwindow.cpp
index 9328d9b46a..5da20dc559 100644
--- a/src/opengl/qopenglwindow.cpp
+++ b/src/opengl/qopenglwindow.cpp
@@ -40,12 +40,12 @@
#include "qopenglwindow.h"
#include <QtGui/QOpenGLFramebufferObject>
#include <QtGui/QOpenGLFunctions>
-#include <QtGui/QOpenGLTextureBlitter>
#include <QtGui/private/qpaintdevicewindow_p.h>
#include <QtGui/private/qopenglextensions_p.h>
#include <QtGui/private/qopenglcontext_p.h>
#include <QtGui/QMatrix4x4>
#include <QtGui/QOffscreenSurface>
+#include <QtOpenGL/QOpenGLTextureBlitter>
#include <QtOpenGL/QOpenGLPaintDevice>
QT_BEGIN_NAMESPACE
diff --git a/src/platformsupport/platformcompositor/platformcompositor.pro b/src/platformsupport/platformcompositor/platformcompositor.pro
index c257d3e42c..89386ab3ef 100644
--- a/src/platformsupport/platformcompositor/platformcompositor.pro
+++ b/src/platformsupport/platformcompositor/platformcompositor.pro
@@ -1,7 +1,7 @@
TARGET = QtPlatformCompositorSupport
MODULE = platformcompositor_support
-QT = core-private gui-private
+QT = core-private gui-private opengl
CONFIG += static internal_module
DEFINES += QT_NO_CAST_FROM_ASCII
diff --git a/src/platformsupport/platformcompositor/qopenglcompositor_p.h b/src/platformsupport/platformcompositor/qopenglcompositor_p.h
index 41a3288240..c9414c82c6 100644
--- a/src/platformsupport/platformcompositor/qopenglcompositor_p.h
+++ b/src/platformsupport/platformcompositor/qopenglcompositor_p.h
@@ -52,7 +52,7 @@
//
#include <QtCore/QTimer>
-#include <QtGui/QOpenGLTextureBlitter>
+#include <QtOpenGL/QOpenGLTextureBlitter>
#include <QtGui/QMatrix4x4>
QT_BEGIN_NAMESPACE
diff --git a/src/platformsupport/platformcompositor/qplatformbackingstoreopenglsupport.cpp b/src/platformsupport/platformcompositor/qplatformbackingstoreopenglsupport.cpp
index bcd2b90a87..ca50910114 100644
--- a/src/platformsupport/platformcompositor/qplatformbackingstoreopenglsupport.cpp
+++ b/src/platformsupport/platformcompositor/qplatformbackingstoreopenglsupport.cpp
@@ -46,11 +46,10 @@
#include <qpa/qplatformgraphicsbuffer.h>
#include <qpa/qplatformgraphicsbufferhelper.h>
+#include <QtOpenGL/QOpenGLTextureBlitter>
#include <QtGui/qopengl.h>
#include <QtGui/QOpenGLFunctions>
#include <QtGui/QOpenGLContext>
-#include <QtGui/QOpenGLTextureBlitter>
-
#include <QtGui/QOffscreenSurface>
#ifndef GL_TEXTURE_BASE_LEVEL
diff --git a/src/plugins/platforms/wasm/qwasmcompositor.cpp b/src/plugins/platforms/wasm/qwasmcompositor.cpp
index 6bf0d69770..74890ead82 100644
--- a/src/plugins/platforms/wasm/qwasmcompositor.cpp
+++ b/src/plugins/platforms/wasm/qwasmcompositor.cpp
@@ -36,7 +36,6 @@
#include <QtGui/private/qwindow_p.h>
#include <QtGui/qopenglcontext.h>
#include <QtGui/qopenglfunctions.h>
-#include <QtGui/qopengltextureblitter.h>
#include <QtGui/qoffscreensurface.h>
#include <QtGui/qpainter.h>
#include <private/qpixmapcache_p.h>
diff --git a/src/plugins/platforms/wasm/qwasmcompositor.h b/src/plugins/platforms/wasm/qwasmcompositor.h
index 6b59d87a0a..250d244c9f 100644
--- a/src/plugins/platforms/wasm/qwasmcompositor.h
+++ b/src/plugins/platforms/wasm/qwasmcompositor.h
@@ -33,7 +33,7 @@
#include <QtGui/qregion.h>
#include <qpa/qplatformwindow.h>
-#include <QtGui/qopengltextureblitter.h>
+#include <QtOpenGL/qopengltextureblitter.h>
#include <QtGui/qpalette.h>
#include <QtGui/qpainter.h>
@@ -43,7 +43,6 @@ class QWasmWindow;
class QWasmScreen;
class QOpenGLContext;
class QOpenGLTexture;
-class QOpenGLTextureBlitter;
class QWasmCompositedWindow
{