diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2020-01-17 14:15:29 +0100 |
|---|---|---|
| committer | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2020-02-04 18:02:41 +0100 |
| commit | fcaa7506ba1823c5af84341ced3914ea0099b446 (patch) | |
| tree | 56a68a0a640160a2d8cd3cbe66c1efef8dd22230 /src/platformsupport | |
| parent | 35262678c31a4aea0df1516c565cf9a2e808b369 (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/platformsupport')
3 files changed, 3 insertions, 4 deletions
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 |