AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Activate tst_qfiledialog for Android

Browse Source 
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>
This commit is contained in:
Andreas Buhr 2022-02-22 10:54:35 +01:00
parent 8b5648743e
commit a1b90caad5
3 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/widgets/dialogs/CMakeLists.txt
View File

@ -8,9 +8,9 @@ add_subdirectory(qfontdialog)
add_subdirectory(qinputdialog) add_subdirectory(qinputdialog)
add_subdirectory(qprogressdialog) add_subdirectory(qprogressdialog)
add_subdirectory(qwizard) add_subdirectory(qwizard)
add_subdirectory(qfiledialog)
# QTBUG-87671 # special case # QTBUG-87671 # special case
if(NOT ANDROID) if(NOT ANDROID)
add_subdirectory(qfiledialog)
add_subdirectory(qmessagebox) add_subdirectory(qmessagebox)
endif() endif()
if(QT_FEATURE_private_tests) if(QT_FEATURE_private_tests)

8
tests/auto/widgets/dialogs/qfiledialog/BLACKLIST Normal file
View File

@ -0,0 +1,8 @@
[filesSelectedSignal]
android # QTBUG-101194
[historyForward]
android # QTBUG-101194
[historyBack]
android # QTBUG-101194
[completer]
android # QTBUG-101194

18
tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
View File

@ -1452,6 +1452,10 @@ void tst_QFiledialog::widgetlessNativeDialog()
{ {
if (!QGuiApplicationPrivate::platformTheme()->usePlatformNativeDialog(QPlatformTheme::FileDialog)) if (!QGuiApplicationPrivate::platformTheme()->usePlatformNativeDialog(QPlatformTheme::FileDialog))
QSKIP("This platform always uses widgets to realize its QFileDialog, instead of the native file dialog."); 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); QApplication::setAttribute(Qt::AA_DontUseNativeDialogs, false);
QFileDialog fd; QFileDialog fd;
fd.setWindowModality(Qt::ApplicationModal); fd.setWindowModality(Qt::ApplicationModal);
@ -1568,6 +1572,10 @@ void tst_QFiledialog::rejectModalDialogs()
{ {
if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
QSKIP("Wayland: This freezes. Figure out why."); 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 // QTBUG-38672 , static functions should return empty Urls
DialogRejecter dr; DialogRejecter dr;
@ -1599,6 +1607,12 @@ void tst_QFiledialog::QTBUG49600_nativeIconProviderCrash()
{ {
if (!QGuiApplicationPrivate::platformTheme()->usePlatformNativeDialog(QPlatformTheme::FileDialog)) if (!QGuiApplicationPrivate::platformTheme()->usePlatformNativeDialog(QPlatformTheme::FileDialog))
QSKIP("This platform always uses widgets to realize its QFileDialog, instead of the native file dialog."); 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; QFileDialog fd;
fd.iconProvider(); fd.iconProvider();
} }
@ -1630,6 +1644,10 @@ void tst_QFiledialog::focusObjectDuringDestruction()
{ {
if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
QSKIP("Wayland: This freezes. Figure out why."); 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()); QTRY_VERIFY(QGuiApplication::topLevelWindows().isEmpty());