1 files changed, 45 insertions, 8 deletions

diff --git a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
index 3ed9743838..2dec3f30e9 100644
--- a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
+++ b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2016 The Qt Company Ltd.
-// 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
 
 #define QT_STATICPLUGIN
 #include <QtWidgets/qstyleplugin.h>
@@ -94,7 +94,9 @@ private slots:
     void libraryPaths_qt_plugin_path_2();
 #endif
 
+#ifdef QT_BUILD_INTERNAL
     void sendPostedEvents();
+#endif  // ifdef QT_BUILD_INTERNAL
 
     void thread();
     void desktopSettingsAware();
@@ -164,6 +166,21 @@ void tst_QApplication::sendEventsOnProcessEvents()
 
     QCoreApplication::postEvent(&app,  new QEvent(QEvent::Type(QEvent::User + 1)));
     QCoreApplication::processEvents();
+
+#ifdef Q_OS_LINUX
+    if ((QSysInfo::productType() == "rhel" && QSysInfo::productVersion().startsWith(u'9'))
+        || (QSysInfo::productType() == "ubuntu" && QSysInfo::productVersion().startsWith(u'2')))
+    {
+        QFile f("/proc/self/maps");
+        QVERIFY(f.open(QIODevice::ReadOnly));
+
+        QByteArray libs = f.readAll();
+        if (libs.contains("libqgtk3.") || libs.contains("libqgtk3TestInfix.")) {
+            QEXPECT_FAIL("", "Fails if qgtk3 (Glib) is loaded, see QTBUG-87137", Abort);
+        }
+    }
+#endif
+
     QVERIFY(spy.recordedEvents.contains(QEvent::User + 1));
 }
 
@@ -294,10 +311,8 @@ void tst_QApplication::alert()
     QApplication::alert(&widget, -1);
     QApplication::alert(&widget, 250);
     widget2.activateWindow();
-    QApplicationPrivate::setActiveWindow(&widget2);
     QApplication::alert(&widget, 0);
     widget.activateWindow();
-    QApplicationPrivate::setActiveWindow(&widget);
     QApplication::alert(&widget, 200);
 }
 
@@ -1126,6 +1141,7 @@ void tst_QApplication::libraryPaths_qt_plugin_path_2()
 }
 #endif
 
+#ifdef QT_BUILD_INTERNAL
 class SendPostedEventsTester : public QObject
 {
     Q_OBJECT
@@ -1147,7 +1163,7 @@ void SendPostedEventsTester::doTest()
     QPointer<SendPostedEventsTester> p = this;
     QApplication::postEvent(this, new QEvent(QEvent::User));
     // DeferredDelete should not be delivered until returning from this function
-    QApplication::postEvent(this, new QDeferredDeleteEvent());
+    deleteLater();
 
     QEventLoop eventLoop;
     QMetaObject::invokeMethod(&eventLoop, "quit", Qt::QueuedConnection);
@@ -1171,6 +1187,7 @@ void tst_QApplication::sendPostedEvents()
     (void) QCoreApplication::exec();
     QVERIFY(p.isNull());
 }
+#endif
 
 void tst_QApplication::thread()
 {
@@ -1315,9 +1332,6 @@ void DeleteLaterWidget::checkDeleteLater()
 
 void tst_QApplication::testDeleteLater()
 {
-#ifdef Q_OS_MAC
-    QSKIP("This test fails and then hangs on OS X, see QTBUG-24318");
-#endif
     int argc = 0;
     QApplication app(argc, nullptr);
     connect(&app, &QGuiApplication::lastWindowClosed, &app, &QCoreApplication::quit);
@@ -2558,8 +2572,26 @@ public:
     explicit ShowCloseShowWidget(bool showAgain, QWidget *parent = nullptr)
         : QWidget(parent), showAgain(showAgain)
     {
+        int timeout = 500;
+#ifdef Q_OS_ANDROID
+        // On Android, CI Android emulator is not running HW accelerated graphics and can be slow,
+        // use a longer timeout to avoid flaky failures
+        timeout = 1000;
+#endif
+        QTimer::singleShot(timeout, this, [] () { QCoreApplication::exit(1); });
+    }
+
+    bool shown = false;
+
+protected:
+    void showEvent(QShowEvent *) override
+    {
         QTimer::singleShot(0, this, &ShowCloseShowWidget::doClose);
-        QTimer::singleShot(500, this, [] () { QCoreApplication::exit(1); });
+        shown = true;
+    }
+    void hideEvent(QHideEvent *) override
+    {
+        shown = false;
     }
 
 private slots:
@@ -2575,16 +2607,21 @@ private:
 
 void tst_QApplication::abortQuitOnShow()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This crash, see QTBUG-123172.");
+
     int argc = 0;
     QApplication app(argc, nullptr);
     ShowCloseShowWidget window1(false);
     window1.setWindowTitle(QLatin1String(QTest::currentTestFunction()));
     window1.show();
+    QVERIFY(QTest::qWaitFor([&window1](){ return window1.shown; }));
     QCOMPARE(QCoreApplication::exec(), 0);
 
     ShowCloseShowWidget window2(true);
     window2.setWindowTitle(QLatin1String(QTest::currentTestFunction()));
     window2.show();
+    QVERIFY(QTest::qWaitFor([&window2](){ return window2.shown; }));
     QCOMPARE(QCoreApplication::exec(), 1);
 }