diff options
| author | Morten Johan Sørvig <morten.sorvig@digia.com> | 2013-09-02 09:30:26 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-02 13:07:35 +0200 |
| commit | 8fc97fdfc76fc62e1faa23f8b768d1ec303329d4 (patch) | |
| tree | 3991bf746691a6c33615718dd05f6e23b9795ec6 /tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog.cpp | |
| parent | 585758389c64e556ef4808308dee27e19241581e (diff) | |
Revert Mac event loop changes.
"Make QGuiApplication::exec() run within NSApplicationMain()"
"Make Qt process native and timer events on Cocoa applications"
"Cocoa: Fix QFontDialog, QColorDialog auto-tests"
This reverts commits
1e14762b8d79118540bd09a84dd3e48f4f5e113e
e4b2a0b4bab2a17a65fedafe9bae50af1fe019f6
df7944e7d7dd8b2bbccbd639eff0ab09745d6cc3
Change-Id: I80b65b5ee0297b090f807bd420664233dfc44f7b
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog.cpp')
| -rw-r--r-- | tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog.cpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog.cpp b/tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog.cpp index ae70adf94b..1762e40a9d 100644 --- a/tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog.cpp +++ b/tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog.cpp @@ -64,7 +64,7 @@ public: public slots: void postKeyReturn(); - void testDefaultOkButton(); + void testGetFont(); void testSetFont(); public slots: @@ -116,12 +116,15 @@ void tst_QFontDialog::postKeyReturn() { } } -void tst_QFontDialog::testDefaultOkButton() +void tst_QFontDialog::testGetFont() { - QFontDialog fd; - fd.show(); - QTimer::singleShot(0, this, SLOT(postKeyReturn())); - QTRY_COMPARE(fd.result(), int(QDialog::Accepted)); +#ifdef Q_OS_MAC + QEXPECT_FAIL("", "Sending QTest::keyClick to OSX font dialog helper fails, see QTBUG-24321", Continue); +#endif + bool ok = false; + QTimer::singleShot(2000, this, SLOT(postKeyReturn())); + QFontDialog::getFont(&ok); + QVERIFY(ok); } void tst_QFontDialog::runSlotWithFailsafeTimer(const char *member) @@ -141,7 +144,7 @@ void tst_QFontDialog::runSlotWithFailsafeTimer(const char *member) void tst_QFontDialog::defaultOkButton() { - runSlotWithFailsafeTimer(SLOT(testDefaultOkButton())); + runSlotWithFailsafeTimer(SLOT(testGetFont())); } void tst_QFontDialog::testSetFont() |