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

Compile with -no-opengl

Browse Source 
A few of the tests were including Qt OpenGL for no good reason,
and the link step should be optional.

Pick-to: 6.2 6.5 6.5.0
Fixes: QTBUG-110420
Change-Id: Icb78c15e49070c6938bf9bb75abfed677af6785b
Reviewed-by: Inho Lee <inho.lee@qt.io>
Reviewed-by: David Edmundson <davidedmundson@kde.org>
This commit is contained in:
Eskil Abrahamsen Blomfeldt 2023-03-06 14:37:17 +01:00
parent a20ee861d6
commit 0042b8040f
10 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,6 @@
#include "mockcompositor.h"
#include <QtOpenGL/QOpenGLWindow>
#include <QtGui/QRasterWindow>
#include <QtGui/QClipboard>
#include <QtGui/QDrag>

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

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

1
tests/auto/wayland/scaling/tst_scaling.cpp
View File

@ -2,7 +2,6 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
#include "mockcompositor.h"
#include <QtOpenGL/QOpenGLWindow>
#include <QtGui/QRasterWindow>
#include <QtGui/qpa/qplatformnativeinterface.h>
#include <QtWaylandClient/private/wayland-wayland-client-protocol.h>

1
tests/auto/wayland/seat/tst_seat.cpp
View File

@ -2,7 +2,6 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include "mockcompositor.h"
#include <QtOpenGL/QOpenGLWindow>
#include <QtGui/QRasterWindow>
#include <QtGui/QEventPoint>

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

@ -3,7 +3,6 @@
#include "mockcompositor.h"
#include <QtOpenGL/QOpenGLWindow>
#include <QtGui/QRasterWindow>
#if QT_CONFIG(cursor)
#include <wayland-cursor.h>

1
tests/auto/wayland/seatv7/tst_seatv7.cpp
View File

@ -2,7 +2,6 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include "mockcompositor.h"
#include <QtOpenGL/QOpenGLWindow>
#include <QtGui/QRasterWindow>
#include <QtGui/QEventPoint>

6
tests/auto/wayland/shared/CMakeLists.txt
View File

@ -53,10 +53,14 @@ qt6_generate_wayland_protocol_server_sources(SharedClientTest
${PROJECT_SOURCE_DIR}/src/3rdparty/protocol/xdg-shell.xml
)
if(QT_FEATURE_opengl)
set(optional_libraries Qt::OpenGL)
endif()
target_link_libraries(SharedClientTest
PUBLIC
Qt::Gui
Qt::OpenGL
${optional_libraries}
Qt::WaylandClientPrivate
Wayland::Server
Threads::Threads # special case

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

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

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

@ -4,7 +4,6 @@
#include "xdgoutputv1.h"
#include "mockcompositor.h"
#include <QtOpenGL/QOpenGLWindow>
#include <QtGui/QRasterWindow>
#include <QtGui/QScreen>

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

@ -2,7 +2,6 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include "mockcompositor.h"
#include <QtOpenGL/QOpenGLWindow>
#include <QtGui/QRasterWindow>
#include <QtGui/qpa/qplatformnativeinterface.h>
#include <QtWaylandClient/private/wayland-wayland-client-protocol.h>