diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-07-08 14:23:51 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-07-08 19:34:10 +0200 |
| commit | e3ce7c87e2969d0b35352dadc8e4fb44776dc140 (patch) | |
| tree | ace9a8a24a7b8996be843418eda4110fb0bc0564 /src/plugins/platforms/xcb/gl_integrations/xcb_glx | |
| parent | d6a724a9b2e8bab1ee35e637887b8968ee66bc26 (diff) | |
Move qglxconvenience to QtOpenGL
Task-number: QTBUG-83255
Change-Id: I7640caf8afbae0a7310a264f333bb3a6cfa3c6ed
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/plugins/platforms/xcb/gl_integrations/xcb_glx')
4 files changed, 4 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 b8ed160b09..769ac953a6 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt @@ -21,9 +21,9 @@ qt_internal_add_plugin(QXcbGlxIntegrationPlugin PUBLIC_LIBRARIES Qt::Core Qt::CorePrivate - Qt::GlxSupportPrivate 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 6318501662..8efd10aa32 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 <QtGlxSupport/private/qglxconvenience_p.h> +#include <QtOpenGL/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 5e406017ca..2ccaa5b80b 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 <QtGlxSupport/private/qglxconvenience_p.h> +#include <QtOpenGL/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 9d537b18f3..c8bed1bfb4 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,7 @@ TARGET = qxcb-glx-integration include(../gl_integrations_plugin_base.pri) -QT += glx_support-private +QT += opengl-private DEFINES += QT_NO_FOREACH |