summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/widgets/kernel')
-rw-r--r--tests/auto/widgets/kernel/qapplication/test/test.pro2
-rw-r--r--tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp6
2 files changed, 6 insertions, 2 deletions
diff --git a/tests/auto/widgets/kernel/qapplication/test/test.pro b/tests/auto/widgets/kernel/qapplication/test/test.pro
index 9f6db3cd3e..61035cc24b 100644
--- a/tests/auto/widgets/kernel/qapplication/test/test.pro
+++ b/tests/auto/widgets/kernel/qapplication/test/test.pro
@@ -14,8 +14,6 @@ win32 {
}
}
-mac*:CONFIG+=insignificant_test
-
TESTDATA = ../test/test.pro ../tmp/README
SUBPROGRAMS = desktopsettingsaware modal
diff --git a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
index fcb6b93e99..fc38840bf7 100644
--- a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
+++ b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
@@ -601,6 +601,8 @@ public slots:
void tst_QApplication::quitOnLastWindowClosed()
{
+#ifndef Q_OS_MAC
+ // Test hangs on Mac OS X, see QTBUG-24319
{
int argc = 0;
QApplication app(argc, 0, QApplication::GuiServer);
@@ -615,6 +617,7 @@ void tst_QApplication::quitOnLastWindowClosed()
// lastWindowClosed() signal should only be sent after the last dialog is closed
QCOMPARE(appSpy.count(), 2);
}
+#endif
{
int argc = 0;
QApplication app(argc, 0, QApplication::GuiServer);
@@ -1204,6 +1207,9 @@ void DeleteLaterWidget::checkDeleteLater()
void tst_QApplication::testDeleteLater()
{
+#ifdef Q_OS_MAC
+ QSKIP("This test fails and then hangs on Mac OS X, see QTBUG-24318");
+#endif
int argc = 0;
QApplication app(argc, 0, QApplication::GuiServer);
connect(&app, SIGNAL(lastWindowClosed()), &app, SLOT(quit()));