From 12a4db710e0e663741e239d76ffe4625e94dace2 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Sun, 13 Jul 2014 13:43:49 +0200 Subject: Revert "Session management for OS X" Broke tst_QMenu::statusTip by closing the menu while it should not. (and therefore, a QTimer::singleShot that fires while following test are running is making the test fail) This reverts commit 50c04d631858639c630e85456e7e003a80e33493. Change-Id: Ib4ef8190f945b915fe268745cc64d471994c5e2d Reviewed-by: Richard J. Moore --- tests/auto/widgets/util/qsystemtrayicon/tst_qsystemtrayicon.cpp | 5 ----- 1 file changed, 5 deletions(-) (limited to 'tests/auto/widgets/util') diff --git a/tests/auto/widgets/util/qsystemtrayicon/tst_qsystemtrayicon.cpp b/tests/auto/widgets/util/qsystemtrayicon/tst_qsystemtrayicon.cpp index a8df1ed2f5..f8924f4de8 100644 --- a/tests/auto/widgets/util/qsystemtrayicon/tst_qsystemtrayicon.cpp +++ b/tests/auto/widgets/util/qsystemtrayicon/tst_qsystemtrayicon.cpp @@ -144,12 +144,7 @@ void tst_QSystemTrayIcon::lastWindowClosed() QTimer::singleShot(2500, &window, SLOT(close())); QTimer::singleShot(20000, qApp, SLOT(quit())); // in case the test fails qApp->exec(); - -#ifdef Q_OS_OSX - QVERIFY(spy.count() == 2); -#else QVERIFY(spy.count() == 1); -#endif } QTEST_MAIN(tst_QSystemTrayIcon) -- cgit v1.2.3