diff options
| author | Andreas Buhr <andreas.buhr@qt.io> | 2022-02-22 10:54:35 +0100 |
|---|---|---|
| committer | Andreas Buhr <andreas.buhr@qt.io> | 2022-02-28 23:08:21 +0100 |
| commit | a1b90caad5aa1217be67e784c3b146cf8f57c117 (patch) | |
| tree | f09c2da182c10c1b64fd197eb7aac06c4ae6854f /tests/auto/widgets/dialogs | |
| parent | 8b5648743efa84ed49bcec0c11d30efa8b15718c (diff) | |
Activate tst_qfiledialog for Android
tst_qfiledialog was disabled because it crashed. It does not any more.
Task-number: QTBUG-87671
Task-number: QTBUG-101194
Pick-to: 6.2 6.3
Change-Id: Icfda2cd01677f3a076b74429fcf66a1de79d2aa9
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Diffstat (limited to 'tests/auto/widgets/dialogs')
| -rw-r--r-- | tests/auto/widgets/dialogs/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/auto/widgets/dialogs/qfiledialog/BLACKLIST | 8 | ||||
| -rw-r--r-- | tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp | 18 |
3 files changed, 27 insertions, 1 deletions
diff --git a/tests/auto/widgets/dialogs/CMakeLists.txt b/tests/auto/widgets/dialogs/CMakeLists.txt index c21c65dbe3..5a9f1f77df 100644 --- a/tests/auto/widgets/dialogs/CMakeLists.txt +++ b/tests/auto/widgets/dialogs/CMakeLists.txt @@ -8,9 +8,9 @@ add_subdirectory(qfontdialog) add_subdirectory(qinputdialog) add_subdirectory(qprogressdialog) add_subdirectory(qwizard) +add_subdirectory(qfiledialog) # QTBUG-87671 # special case if(NOT ANDROID) - add_subdirectory(qfiledialog) add_subdirectory(qmessagebox) endif() if(QT_FEATURE_private_tests) diff --git a/tests/auto/widgets/dialogs/qfiledialog/BLACKLIST b/tests/auto/widgets/dialogs/qfiledialog/BLACKLIST new file mode 100644 index 0000000000..38c40c6211 --- /dev/null +++ b/tests/auto/widgets/dialogs/qfiledialog/BLACKLIST @@ -0,0 +1,8 @@ +[filesSelectedSignal] +android # QTBUG-101194 +[historyForward] +android # QTBUG-101194 +[historyBack] +android # QTBUG-101194 +[completer] +android # QTBUG-101194 diff --git a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp index c05c72213a..877c61fb64 100644 --- a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp +++ b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp @@ -1452,6 +1452,10 @@ void tst_QFiledialog::widgetlessNativeDialog() { if (!QGuiApplicationPrivate::platformTheme()->usePlatformNativeDialog(QPlatformTheme::FileDialog)) QSKIP("This platform always uses widgets to realize its QFileDialog, instead of the native file dialog."); +#ifdef Q_OS_ANDROID + // QTBUG-101194 + QSKIP("Android: This keeeps the window open. Figure out why."); +#endif QApplication::setAttribute(Qt::AA_DontUseNativeDialogs, false); QFileDialog fd; fd.setWindowModality(Qt::ApplicationModal); @@ -1568,6 +1572,10 @@ void tst_QFiledialog::rejectModalDialogs() { if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) QSKIP("Wayland: This freezes. Figure out why."); +#ifdef Q_OS_ANDROID + // QTBUG-101194 + QSKIP("Android: This freezes. Figure out why."); +#endif // QTBUG-38672 , static functions should return empty Urls DialogRejecter dr; @@ -1599,6 +1607,12 @@ 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."); + +#ifdef Q_OS_ANDROID + // QTBUG-101194 + QSKIP("Android: This hangs. Figure out why."); +#endif + QFileDialog fd; fd.iconProvider(); } @@ -1630,6 +1644,10 @@ void tst_QFiledialog::focusObjectDuringDestruction() { if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) QSKIP("Wayland: This freezes. Figure out why."); +#ifdef Q_OS_ANDROID + // QTBUG-101194 + QSKIP("Android: This freezes. Figure out why."); +#endif QTRY_VERIFY(QGuiApplication::topLevelWindows().isEmpty()); |