1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build: Add dependency on OpenGL module

Browse Source 
Several of the QOpenGL* classes we depend on has moved to QtOpenGL, add
the dependency and fix the include paths.

Task-number: QTBUG-74409
Change-Id: Iab7949dd67befaa71cf2cfa041771e93f4e47160
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Johan Klokkhammer Helsing 2020-01-22 12:39:59 +01:00 committed by Simon Hausmann
parent 6c26a60a72
commit 3a6859e808
14 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/wayland/plugins/hardwareintegration/dmabuf-server/dmabuf-server.pro
View File

@ -1,7 +1,7 @@
# We have a bunch of C code with casts, so we can't have this option # We have a bunch of C code with casts, so we can't have this option
QMAKE_CXXFLAGS_WARN_ON -= -Wcast-qual QMAKE_CXXFLAGS_WARN_ON -= -Wcast-qual
QT += waylandclient-private QT += waylandclient-private opengl
include(../../../../hardwareintegration/client/dmabuf-server/dmabuf-server.pri) include(../../../../hardwareintegration/client/dmabuf-server/dmabuf-server.pri)

2
src/plugins/platforms/wayland/plugins/hardwareintegration/drm-egl-server/drm-egl-server.pro
View File

@ -1,7 +1,7 @@
# We have a bunch of C code with casts, so we can't have this option # We have a bunch of C code with casts, so we can't have this option
QMAKE_CXXFLAGS_WARN_ON -= -Wcast-qual QMAKE_CXXFLAGS_WARN_ON -= -Wcast-qual
QT += waylandclient-private QT += waylandclient-private opengl
include(../../../../hardwareintegration/client/drm-egl-server/drm-egl-server.pri) include(../../../../hardwareintegration/client/drm-egl-server/drm-egl-server.pri)

2
src/plugins/platforms/wayland/plugins/hardwareintegration/shm-emulation-server/shm-emulation-server.pro
View File

@ -1,7 +1,7 @@
# We have a bunch of C code with casts, so we can't have this option # We have a bunch of C code with casts, so we can't have this option
QMAKE_CXXFLAGS_WARN_ON -= -Wcast-qual QMAKE_CXXFLAGS_WARN_ON -= -Wcast-qual
QT += waylandclient-private QT += waylandclient-private opengl
include(../../../../hardwareintegration/client/shm-emulation-server/shm-emulation-server.pri) include(../../../../hardwareintegration/client/shm-emulation-server/shm-emulation-server.pri)

2
src/plugins/platforms/wayland/plugins/hardwareintegration/vulkan-server/vulkan-server.pro
View File

@ -1,7 +1,7 @@
# We have a bunch of C code with casts, so we can't have this option # We have a bunch of C code with casts, so we can't have this option
QMAKE_CXXFLAGS_WARN_ON -= -Wcast-qual QMAKE_CXXFLAGS_WARN_ON -= -Wcast-qual
QT += waylandclient-private QT += waylandclient-private opengl
include(../../../../hardwareintegration/client/vulkan-server/vulkan-server.pri) include(../../../../hardwareintegration/client/vulkan-server/vulkan-server.pri)

2
tests/auto/wayland/datadevicev1/tst_datadevicev1.cpp
View File

@ -28,8 +28,8 @@
#include "mockcompositor.h" #include "mockcompositor.h"
#include <QtOpenGL/QOpenGLWindow>
#include <QtGui/QRasterWindow> #include <QtGui/QRasterWindow>
#include <QtGui/QOpenGLWindow>
#include <QtGui/QClipboard> #include <QtGui/QClipboard>
#include <QtGui/QDrag> #include <QtGui/QDrag>

2
tests/auto/wayland/primaryselectionv1/tst_primaryselectionv1.cpp
View File

@ -30,8 +30,8 @@
#include <qwayland-server-wp-primary-selection-unstable-v1.h> #include <qwayland-server-wp-primary-selection-unstable-v1.h>
#include <QtOpenGL/QOpenGLWindow>
#include <QtGui/QRasterWindow> #include <QtGui/QRasterWindow>
#include <QtGui/QOpenGLWindow>
#include <QtGui/QClipboard> #include <QtGui/QClipboard>
#include <QtCore/private/qcore_unix_p.h> #include <QtCore/private/qcore_unix_p.h>

2
tests/auto/wayland/seatv4/tst_seatv4.cpp
View File

@ -28,8 +28,8 @@
#include "mockcompositor.h" #include "mockcompositor.h"
#include <QtOpenGL/QOpenGLWindow>
#include <QtGui/QRasterWindow> #include <QtGui/QRasterWindow>
#include <QtGui/QOpenGLWindow>
#if QT_CONFIG(cursor) #if QT_CONFIG(cursor)
#include <wayland-cursor.h> #include <wayland-cursor.h>
#include <QtGui/private/qguiapplication_p.h> #include <QtGui/private/qguiapplication_p.h>

8
tests/auto/wayland/seatv5/tst_seatv5.cpp
View File

@ -27,8 +27,8 @@
****************************************************************************/ ****************************************************************************/
#include "mockcompositor.h" #include "mockcompositor.h"
#include <QtOpenGL/QOpenGLWindow>
#include <QtGui/QRasterWindow> #include <QtGui/QRasterWindow>
#include <QtGui/QOpenGLWindow>
using namespace MockCompositor; using namespace MockCompositor;
@ -397,9 +397,9 @@ public:
, touchPoints(event->touchPoints()) , touchPoints(event->touchPoints())
{ {
} }
const QEvent::Type type{}; QEvent::Type type{};
const Qt::TouchPointStates touchPointStates{}; Qt::TouchPointStates touchPointStates{};
const QList<QTouchEvent::TouchPoint> touchPoints; QList<QTouchEvent::TouchPoint> touchPoints;
}; };
QVector<Event> m_events; QVector<Event> m_events;
}; };

2
tests/auto/wayland/shared/shared.pri
View File

@ -1,4 +1,4 @@
QT += testlib waylandclient-private QT += testlib waylandclient-private opengl
CONFIG += testcase wayland-scanner CONFIG += testcase wayland-scanner
QMAKE_USE += wayland-server QMAKE_USE += wayland-server

2
tests/auto/wayland/shared_old/shared_old.pri
View File

@ -1,6 +1,6 @@
CONFIG += testcase link_pkgconfig CONFIG += testcase link_pkgconfig
QT += testlib QT += testlib
QT += core-private gui-private waylandclient-private QT += core-private gui-private waylandclient-private opengl
QMAKE_USE += wayland-client wayland-server QMAKE_USE += wayland-client wayland-server

2
tests/auto/wayland/surface/tst_surface.cpp
View File

@ -29,7 +29,7 @@
#include "mockcompositor.h" #include "mockcompositor.h"
#include <QtGui/QRasterWindow> #include <QtGui/QRasterWindow>
#if QT_CONFIG(opengl) #if QT_CONFIG(opengl)
#include <QtGui/QOpenGLWindow> #include <QtOpenGL/QOpenGLWindow>
#endif #endif
using namespace MockCompositor; using namespace MockCompositor;

2
tests/auto/wayland/xdgdecorationv1/tst_xdgdecorationv1.cpp
View File

@ -30,8 +30,8 @@
#include <qwayland-server-xdg-decoration-unstable-v1.h> #include <qwayland-server-xdg-decoration-unstable-v1.h>
#include <QtOpenGL/QOpenGLWindow>
#include <QtGui/QRasterWindow> #include <QtGui/QRasterWindow>
#include <QtGui/QOpenGLWindow>
#include <QtGui/QClipboard> #include <QtGui/QClipboard>
#include <QtCore/private/qcore_unix_p.h> #include <QtCore/private/qcore_unix_p.h>

2
tests/auto/wayland/xdgoutput/tst_xdgoutput.cpp
View File

@ -27,8 +27,8 @@
****************************************************************************/ ****************************************************************************/
#include "mockcompositor.h" #include "mockcompositor.h"
#include <QtOpenGL/QOpenGLWindow>
#include <QtGui/QRasterWindow> #include <QtGui/QRasterWindow>
#include <QtGui/QOpenGLWindow>
#include <QtGui/QScreen> #include <QtGui/QScreen>
#include <qwayland-server-xdg-output-unstable-v1.h> #include <qwayland-server-xdg-output-unstable-v1.h>

2
tests/auto/wayland/xdgshell/tst_xdgshell.cpp
View File

@ -27,8 +27,8 @@
****************************************************************************/ ****************************************************************************/
#include "mockcompositor.h" #include "mockcompositor.h"
#include <QtOpenGL/QOpenGLWindow>
#include <QtGui/QRasterWindow> #include <QtGui/QRasterWindow>
#include <QtGui/QOpenGLWindow>
#include <QtGui/qpa/qplatformnativeinterface.h> #include <QtGui/qpa/qplatformnativeinterface.h>
#include <QtWaylandClient/private/wayland-wayland-client-protocol.h> #include <QtWaylandClient/private/wayland-wayland-client-protocol.h>