diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-07-09 15:48:19 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-07-10 00:47:56 +0200 |
| commit | 6758f73bb7f85898b2f2a24149bdacf898601e25 (patch) | |
| tree | 0dc603ac1579b51079687e62004d12cf8f426999 /src/plugins/platforms/xcb | |
| parent | 60d72b7ab6b08a43248764ddc7b710fc757a3e5a (diff) | |
Move glxconvenience into QtGui
OpenGL is not quite as dead as initially assumed.
Task-number: QTBUG-83255
Change-Id: I953040149812a5258caad5fe6bac0835e1982dd0
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/plugins/platforms/xcb')
4 files changed, 2 insertions, 4 deletions
diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt index 769ac953a6..94d9b60310 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt @@ -23,7 +23,6 @@ qt_internal_add_plugin(QXcbGlxIntegrationPlugin Qt::CorePrivate Qt::Gui Qt::GuiPrivate - Qt::OpenGLPrivate Qt::XcbQpaPrivate ) diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp index 8efd10aa32..4c1786394f 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp @@ -55,7 +55,7 @@ #include <QtGui/QOffscreenSurface> #include "qglxintegration.h" -#include <QtOpenGL/private/qglxconvenience_p.h> +#include <QtGui/private/qglxconvenience_p.h> #include "qxcbglintegration.h" diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxwindow.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxwindow.cpp index 2ccaa5b80b..c021388c5b 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxwindow.cpp +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxwindow.cpp @@ -40,7 +40,7 @@ #include "qxcbglxwindow.h" #include "qxcbscreen.h" -#include <QtOpenGL/private/qglxconvenience_p.h> +#include <QtGui/private/qglxconvenience_p.h> #include <QDebug> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/xcb_glx.pro b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/xcb_glx.pro index c8bed1bfb4..0ba7926f9a 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/xcb_glx.pro +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/xcb_glx.pro @@ -1,7 +1,6 @@ TARGET = qxcb-glx-integration include(../gl_integrations_plugin_base.pri) -QT += opengl-private DEFINES += QT_NO_FOREACH |