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/offscreen | |
| 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/offscreen')
4 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/platforms/offscreen/.prev_CMakeLists.txt b/src/plugins/platforms/offscreen/.prev_CMakeLists.txt index 68abfbdea5..8d2a62d2bc 100644 --- a/src/plugins/platforms/offscreen/.prev_CMakeLists.txt +++ b/src/plugins/platforms/offscreen/.prev_CMakeLists.txt @@ -31,7 +31,7 @@ qt_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_opengl AND QT_ SOURCES qoffscreenintegration_x11.cpp qoffscreenintegration_x11.h PUBLIC_LIBRARIES - Qt::GlxSupportPrivate + Qt::OpenGLPrivate ) #### Keys ignored in scope 3:.:.:offscreen.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: diff --git a/src/plugins/platforms/offscreen/CMakeLists.txt b/src/plugins/platforms/offscreen/CMakeLists.txt index 52d2b829d8..40783206e0 100644 --- a/src/plugins/platforms/offscreen/CMakeLists.txt +++ b/src/plugins/platforms/offscreen/CMakeLists.txt @@ -32,7 +32,7 @@ qt_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_opengl AND QT_ SOURCES qoffscreenintegration_x11.cpp qoffscreenintegration_x11.h PUBLIC_LIBRARIES - Qt::GlxSupportPrivate + Qt::OpenGLPrivate ) #### Keys ignored in scope 3:.:.:offscreen.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: diff --git a/src/plugins/platforms/offscreen/offscreen.pro b/src/plugins/platforms/offscreen/offscreen.pro index 5683b5e8ce..9364775c27 100644 --- a/src/plugins/platforms/offscreen/offscreen.pro +++ b/src/plugins/platforms/offscreen/offscreen.pro @@ -19,7 +19,7 @@ OTHER_FILES += offscreen.json qtConfig(xlib):qtConfig(opengl):!qtConfig(opengles2) { SOURCES += qoffscreenintegration_x11.cpp HEADERS += qoffscreenintegration_x11.h - QT += glx_support-private + QT += opengl-private } PLUGIN_TYPE = platforms diff --git a/src/plugins/platforms/offscreen/qoffscreenintegration_x11.cpp b/src/plugins/platforms/offscreen/qoffscreenintegration_x11.cpp index bcf996f708..4b37aac468 100644 --- a/src/plugins/platforms/offscreen/qoffscreenintegration_x11.cpp +++ b/src/plugins/platforms/offscreen/qoffscreenintegration_x11.cpp @@ -45,7 +45,7 @@ #include <X11/Xlib.h> #include <GL/glx.h> -#include <QtGlxSupport/private/qglxconvenience_p.h> +#include <QtOpenGL/private/qglxconvenience_p.h> #include <qpa/qplatformsurface.h> #include <qsurface.h> |