1 files changed, 22 insertions, 2 deletions
diff --git a/tests/auto/qmltest/tst_qmltest.cpp b/tests/auto/qmltest/tst_qmltest.cpp
index 746430c5..cde45b0b 100644
--- a/tests/auto/qmltest/tst_qmltest.cpp
+++ b/tests/auto/qmltest/tst_qmltest.cpp
@@ -28,13 +28,33 @@
 ****************************************************************************/
 
 #include <QtQuickTest/quicktest.h>
+
+class tst_qmltest: public QObject
+{
+    Q_OBJECT
+private slots:
+    void skiptest() { QSKIP("This test will fail, skipping."); };
+};
+
 int main(int argc, char **argv)
 {
     if (!qEnvironmentVariableIsEmpty("QEMU_LD_PREFIX")) {
-        qWarning("This test will fail due to QEMU emulation shortcomings.");
-        return 0;
+        qWarning("This test would fail due to QEMU emulation shortcomings, so it will be skipped.");
+        tst_qmltest skip;
+        return QTest::qExec(&skip, argc, argv);
     }
+#ifdef Q_OS_QNX
+    if (qEnvironmentVariable("QTEST_ENVIRONMENT").split(' ').contains("ci") &&
+        qEnvironmentVariable("QT_QPA_PLATFORM").split(' ').contains("offscreen")
+    ) {
+        qWarning("This test would fail on CI QNX QEMU without OpenGL support, so it will be skipped.");
+        tst_qmltest skip;
+        return QTest::qExec(&skip, argc, argv);
+    }
+#endif
     qputenv("QSG_RHI_BACKEND", "opengl");
     QTEST_SET_MAIN_SOURCE_PATH
     return quick_test_main(argc, argv, "qmltest", QUICK_TEST_SOURCE_DIR);
 }
+
+#include "tst_qmltest.moc"