diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2014-07-13 13:43:49 +0200 |
|---|---|---|
| committer | Olivier Goffart <ogoffart@woboq.com> | 2014-07-13 13:48:19 +0200 |
| commit | 12a4db710e0e663741e239d76ffe4625e94dace2 (patch) | |
| tree | a8265beb2afb55be429c2811b1434936548bb459 /tests/auto/widgets/util | |
| parent | ff7fdf78efb7287af6347c710ac00a0d17d9dfc1 (diff) | |
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 <rich@kde.org>
Diffstat (limited to 'tests/auto/widgets/util')
| -rw-r--r-- | tests/auto/widgets/util/qsystemtrayicon/tst_qsystemtrayicon.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
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) |