From 1c9a4093a5402b4e7a8ebe1aea819d98af833e40 Mon Sep 17 00:00:00 2001 From: Christoph Schleifenbaum Date: Tue, 10 Apr 2012 17:17:41 +0200 Subject: Respect the DontUseNativeDialog flag. QFontDialog and QColorDialog were ignoring the DontUseNativeDialog. This lead to a native (Cocoa) dialog created all the time. Fix the testcase for QFontDialog. It needs the DontUseNativeDialog flag set. Task-number: QTBUG-24321 Change-Id: I159c1ad057bac38226f1e01a56b15f142650bfd8 Reviewed-by: Bradley T. Hughes --- tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'tests/auto/widgets') diff --git a/tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog.cpp b/tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog.cpp index 6b2caf17d7..533014b1c9 100644 --- a/tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog.cpp +++ b/tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog.cpp @@ -160,12 +160,9 @@ class FriendlyFontDialog : public QFontDialog void tst_QFontDialog::task256466_wrongStyle() { -#ifdef Q_OS_MAC - QSKIP("Test crashes on Mac OS X, see QTBUG-24321"); -#endif - QFontDatabase fdb; FriendlyFontDialog dialog; + dialog.setOption(QFontDialog::DontUseNativeDialog); QListView *familyList = reinterpret_cast(dialog.d_func()->familyList); QListView *styleList = reinterpret_cast(dialog.d_func()->styleList); QListView *sizeList = reinterpret_cast(dialog.d_func()->sizeList); -- cgit v1.2.3