diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2020-01-22 16:01:53 +0100 |
|---|---|---|
| committer | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2020-02-21 10:00:47 +0100 |
| commit | 8193f9e0ecc0a7592310e1c26310ba502c091374 (patch) | |
| tree | 10d9b80393a33ed66bce565b1ed4e34c5aac65da /src/plugins/platforms | |
| parent | 4f076db3d2e2e27cc56029fe878056ee79def56f (diff) | |
Move QOpenGLVertexArrayObject from QtGui to QtOpenGL
Task-number: QTBUG-74409
Change-Id: I6442693ca2b28b3a66f0f4fb41843e1e404df32b
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'src/plugins/platforms')
| -rw-r--r-- | src/plugins/platforms/eglfs/.prev_CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/eglfs/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/eglfs/api/api.pri | 1 | ||||
| -rw-r--r-- | src/plugins/platforms/eglfs/api/qeglfscursor.cpp | 2 |
4 files changed, 6 insertions, 1 deletions
diff --git a/src/plugins/platforms/eglfs/.prev_CMakeLists.txt b/src/plugins/platforms/eglfs/.prev_CMakeLists.txt index 4fed525392..896b8cd3e8 100644 --- a/src/plugins/platforms/eglfs/.prev_CMakeLists.txt +++ b/src/plugins/platforms/eglfs/.prev_CMakeLists.txt @@ -84,6 +84,8 @@ qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl SOURCES api/qeglfscontext.cpp api/qeglfscontext_p.h api/qeglfscursor.cpp api/qeglfscursor_p.h + PUBLIC_LIBRARIES + Qt::OpenGLPrivate ) ##################################################################### ## QEglFSIntegrationPlugin Plugin: diff --git a/src/plugins/platforms/eglfs/CMakeLists.txt b/src/plugins/platforms/eglfs/CMakeLists.txt index 03de79d6f0..0078c1f0d7 100644 --- a/src/plugins/platforms/eglfs/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/CMakeLists.txt @@ -80,6 +80,8 @@ qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl SOURCES api/qeglfscontext.cpp api/qeglfscontext_p.h api/qeglfscursor.cpp api/qeglfscursor_p.h + PUBLIC_LIBRARIES + Qt::OpenGLPrivate ) ##################################################################### ## QEglFSIntegrationPlugin Plugin: diff --git a/src/plugins/platforms/eglfs/api/api.pri b/src/plugins/platforms/eglfs/api/api.pri index 68965b58d8..bcb72c9ea7 100644 --- a/src/plugins/platforms/eglfs/api/api.pri +++ b/src/plugins/platforms/eglfs/api/api.pri @@ -15,6 +15,7 @@ HEADERS += $$PWD/qeglfswindow_p.h \ $$PWD/qeglfsglobal_p.h qtConfig(opengl) { + QT += opengl-private SOURCES += \ $$PWD/qeglfscursor.cpp \ $$PWD/qeglfscontext.cpp diff --git a/src/plugins/platforms/eglfs/api/qeglfscursor.cpp b/src/plugins/platforms/eglfs/api/qeglfscursor.cpp index 98e05195ee..b8bd7e038b 100644 --- a/src/plugins/platforms/eglfs/api/qeglfscursor.cpp +++ b/src/plugins/platforms/eglfs/api/qeglfscursor.cpp @@ -50,7 +50,7 @@ #include <QtCore/QJsonObject> #include <QtGui/private/qguiapplication_p.h> -#include <QtGui/private/qopenglvertexarrayobject_p.h> +#include <QtOpenGL/private/qopenglvertexarrayobject_p.h> #ifndef GL_VERTEX_ARRAY_BINDING #define GL_VERTEX_ARRAY_BINDING 0x85B5 |