diff options
| author | Ilya Fedin <fedin-ilja2010@ya.ru> | 2023-03-28 01:16:56 +0400 |
|---|---|---|
| committer | Ilya Fedin <fedin-ilja2010@ya.ru> | 2023-04-03 19:45:49 +0400 |
| commit | 2eb17abf4262b467140ed4262320bf60cbda3ba2 (patch) | |
| tree | 4f6b4fcf76ef43560e967ac034e65167da23fc11 /tests | |
| parent | b66d93c6b827ef2d194916c68f1f64fe874d5163 (diff) | |
| download | qtwayland-2eb17abf4262b467140ed4262320bf60cbda3ba2.tar.gz | |
Client: Check for shell integration when initializing platform plugin
This makes QWaylandDisplay::initialize return a boolean and moves the
QWaylandIntegration's failure check out of constructor as
QWaylandIntegration::shellIntegration is a virtual method, this also
removes the out-of-date comments about processEvents as it's no more
used in QWaylandDisplay::forceRoundTrip.
Fixes: QTBUG-102457
Pick-to: 6.5
Change-Id: I3c8f1d9fd195326b587b45318443c2beee1ebfc2
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: David Edmundson <davidedmundson@kde.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/client/clientextension/tst_clientextension.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/tests/auto/client/clientextension/tst_clientextension.cpp b/tests/auto/client/clientextension/tst_clientextension.cpp index a6e79bd2..91b02e3b 100644 --- a/tests/auto/client/clientextension/tst_clientextension.cpp +++ b/tests/auto/client/clientextension/tst_clientextension.cpp @@ -123,5 +123,17 @@ void tst_clientextension::globalRemoved() QCOMPARE(spy.size(), 1); } -QCOMPOSITOR_TEST_MAIN(tst_clientextension) +int main(int argc, char **argv) +{ + QTemporaryDir tmpRuntimeDir; + setenv("XDG_RUNTIME_DIR", tmpRuntimeDir.path().toLocal8Bit(), 1); + setenv("QT_QPA_PLATFORM", "wayland", 1); + setenv("QT_WAYLAND_DONT_CHECK_SHELL_INTEGRATION", "1", 1); + + tst_clientextension tc; + QGuiApplication app(argc, argv); + QTEST_SET_MAIN_SOURCE_PATH + return QTest::qExec(&tc, argc, argv); +} + #include "tst_clientextension.moc" |