1 files changed, 24 insertions, 17 deletions
diff --git a/tests/auto/client/clientextension/tst_clientextension.cpp b/tests/auto/client/clientextension/tst_clientextension.cpp
index 209afa822..8dd4e0d98 100644
--- a/tests/auto/client/clientextension/tst_clientextension.cpp
+++ b/tests/auto/client/clientextension/tst_clientextension.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2021 David Redondo <qt@david-redondo.de>
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include <QSignalSpy>
 #include <QtGui/private/qguiapplication_p.h>
@@ -14,17 +14,12 @@
 
 using namespace MockCompositor;
 
-class TestExtension : public QWaylandClientExtensionTemplate<TestExtension>,
-                      public QtWayland::test_interface
+class TestExtension
+    : public QWaylandClientExtensionTemplate<TestExtension, &QtWayland::test_interface::release>,
+      public QtWayland::test_interface
 {
 public:
-    TestExtension() : QWaylandClientExtensionTemplate<TestExtension>(1) { }
-    ~TestExtension()
-    {
-        if (object()) {
-            release();
-        }
-    }
+    TestExtension() : QWaylandClientExtensionTemplate(1){};
     void initialize() { QWaylandClientExtension::initialize(); }
 };
 
@@ -69,10 +64,10 @@ void tst_clientextension::createWithoutGlobal()
     QSignalSpy spy(&extension, &QWaylandClientExtension::activeChanged);
     QVERIFY(spy.isValid());
     QVERIFY(!extension.isActive());
-    QCOMPARE(spy.count(), 0);
+    QCOMPARE(spy.size(), 0);
     extension.initialize();
     QVERIFY(!extension.isActive());
-    QCOMPARE(spy.count(), 0);
+    QCOMPARE(spy.size(), 0);
 }
 
 void tst_clientextension::createWithGlobalAutomatic()
@@ -83,7 +78,7 @@ void tst_clientextension::createWithGlobalAutomatic()
     QSignalSpy spy(&extension, &QWaylandClientExtension::activeChanged);
     QVERIFY(spy.isValid());
     QTRY_VERIFY(extension.isActive());
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
 }
 
 void tst_clientextension::createWithGlobalManual()
@@ -96,7 +91,7 @@ void tst_clientextension::createWithGlobalManual()
     QVERIFY(spy.isValid());
     extension.initialize();
     QVERIFY(extension.isActive());
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
 }
 
 void tst_clientextension::globalBecomesAvailable()
@@ -106,7 +101,7 @@ void tst_clientextension::globalBecomesAvailable()
     QVERIFY(spy.isValid());
     exec([this] { add<TestGlobal>(); });
     QTRY_VERIFY(extension.isActive());
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
 }
 
 void tst_clientextension::globalRemoved()
@@ -120,8 +115,20 @@ void tst_clientextension::globalRemoved()
 
     exec([this] { removeAll<TestGlobal>(); });
     QTRY_VERIFY(!extension.isActive());
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
+}
+
+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);
 }
 
-QCOMPOSITOR_TEST_MAIN(tst_clientextension)
 #include "tst_clientextension.moc"