summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2015-11-27 17:38:42 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2015-11-27 19:24:34 +0000
commit37a55e8840e53c78f855f17f2b5f453ed2058099 (patch)
tree9d5dcbe6f8b5078fe6a165e3b35b76817374fbd5 /tests
parenteddb938c39d03e163ef47c965ea07ab19250eeed (diff)
parent8c57e8c012d1045f2bdb30d376625a32c33fdfc4 (diff)
Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
index bc3c5e73f0..42e2bd09a5 100644
--- a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
+++ b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
@@ -165,6 +165,7 @@ private slots:
#endif // QT_BUILD_INTERNAL
#endif
void rejectModalDialogs();
+ void QTBUG49600_nativeIconProviderCrash();
private:
void cleanupSettingsFile();
@@ -1487,5 +1488,13 @@ void tst_QFiledialog::rejectModalDialogs()
QVERIFY(file.isEmpty());
}
+void tst_QFiledialog::QTBUG49600_nativeIconProviderCrash()
+{
+ if (!QGuiApplicationPrivate::platformTheme()->usePlatformNativeDialog(QPlatformTheme::FileDialog))
+ QSKIP("This platform always uses widgets to realize its QFileDialog, instead of the native file dialog.");
+ QFileDialog fd;
+ fd.iconProvider();
+}
+
QTEST_MAIN(tst_QFiledialog)
#include "tst_qfiledialog.moc"