diff options
Diffstat (limited to 'tests/auto/widgets/dialogs')
9 files changed, 12 insertions, 47 deletions
diff --git a/tests/auto/widgets/dialogs/CMakeLists.txt b/tests/auto/widgets/dialogs/CMakeLists.txt index 508093e7ad..0c52076efe 100644 --- a/tests/auto/widgets/dialogs/CMakeLists.txt +++ b/tests/auto/widgets/dialogs/CMakeLists.txt @@ -1,19 +1,18 @@ +# Generated from dialogs.pro. + add_subdirectory(qcolordialog) add_subdirectory(qdialog) add_subdirectory(qerrormessage) -if (NOT WINRT) - add_subdirectory(qfiledialog) - add_subdirectory(qfiledialog2) - add_subdirectory(qmessagebox) -endif() -if (NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR NOT WIN32) - add_subdirectory(qfilesystemmodel) -endif() +add_subdirectory(qfiledialog) +add_subdirectory(qfiledialog2) add_subdirectory(qfontdialog) add_subdirectory(qinputdialog) +add_subdirectory(qmessagebox) add_subdirectory(qprogressdialog) -if (QT_FEATURE_private_tests) +add_subdirectory(qwizard) +if(NOT MINGW) + add_subdirectory(qfilesystemmodel) +endif() +if(QT_FEATURE_private_tests) add_subdirectory(qsidebar) endif() -add_subdirectory(qwizard) - diff --git a/tests/auto/widgets/dialogs/dialogs.pro b/tests/auto/widgets/dialogs/dialogs.pro index e0ebe78f33..cf548f2dea 100644 --- a/tests/auto/widgets/dialogs/dialogs.pro +++ b/tests/auto/widgets/dialogs/dialogs.pro @@ -18,4 +18,3 @@ SUBDIRS=\ mac:qinputdialog.CONFIG += no_check_target # QTBUG-25496 mingw: SUBDIRS -= qfilesystemmodel # QTBUG-29403 -winrt: SUBDIRS -= qfiledialog qfiledialog2 qmessagebox # QTBUG-68297 diff --git a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp index 94915d0e40..d469b0f9bd 100644 --- a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp +++ b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp @@ -307,10 +307,6 @@ void tst_QDialog::showAsTool() testWidget.activateWindow(); QVERIFY(QTest::qWaitForWindowActive(&testWidget)); dialog.exec(); -#ifdef Q_OS_WINRT - QEXPECT_FAIL("", "As winrt does not support child widgets, the dialog is being activated" - "together with the main widget.", Continue); -#endif if (testWidget.style()->styleHint(QStyle::SH_Widget_ShareActivation, 0, &testWidget)) { QCOMPARE(dialog.wasActive(), true); } else { @@ -468,8 +464,7 @@ void tst_QDialog::snapToDefaultButton() #ifdef QT_NO_CURSOR QSKIP("Test relies on there being a cursor"); #else - if (!QGuiApplication::platformName().compare(QLatin1String("wayland"), Qt::CaseInsensitive) - || !QGuiApplication::platformName().compare(QLatin1String("winrt"), Qt::CaseInsensitive)) + if (!QGuiApplication::platformName().compare(QLatin1String("wayland"), Qt::CaseInsensitive)) QSKIP("This platform does not support setting the cursor position."); const QRect dialogGeometry(QGuiApplication::primaryScreen()->availableGeometry().topLeft() diff --git a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp index d3b7f53bb4..4e2699889f 100644 --- a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp +++ b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp @@ -276,7 +276,7 @@ void tst_QFileDialog2::showNameFilterDetails() void tst_QFileDialog2::unc() { -#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT) +#if defined(Q_OS_WIN) // Only test UNC on Windows./ QString dir("\\\\" + QtNetworkSettings::winServerName() + "\\testsharewritable"); #else diff --git a/tests/auto/widgets/dialogs/qfilesystemmodel/BLACKLIST b/tests/auto/widgets/dialogs/qfilesystemmodel/BLACKLIST index d9d7786314..4119afce84 100644 --- a/tests/auto/widgets/dialogs/qfilesystemmodel/BLACKLIST +++ b/tests/auto/widgets/dialogs/qfilesystemmodel/BLACKLIST @@ -1,12 +1,5 @@ -winrt -[sort] -winrt [sort:QFileDialog usage] ubuntu b2qt [specialFiles] b2qt -[dirsBeforeFiles] -winrt -[drives] -winrt diff --git a/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp b/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp index 63bf103725..e814e79dbe 100644 --- a/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp +++ b/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp @@ -340,14 +340,7 @@ bool tst_QFileSystemModel::createFiles(QFileSystemModel *model, const QString &t if (initial_file[0] == '.') { const QString hiddenFile = QDir::toNativeSeparators(file.fileName()); const auto nativeHiddenFile = reinterpret_cast<const wchar_t *>(hiddenFile.utf16()); -#ifndef Q_OS_WINRT DWORD currentAttributes = ::GetFileAttributes(nativeHiddenFile); -#else // !Q_OS_WINRT - WIN32_FILE_ATTRIBUTE_DATA attributeData; - if (!::GetFileAttributesEx(nativeHiddenFile, GetFileExInfoStandard, &attributeData)) - attributeData.dwFileAttributes = 0xFFFFFFFF; - DWORD currentAttributes = attributeData.dwFileAttributes; -#endif // Q_OS_WINRT if (currentAttributes == 0xFFFFFFFF) { qErrnoWarning("failed to get file attributes: %s", qPrintable(hiddenFile)); return false; diff --git a/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp b/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp index 543128915e..6985c37cb6 100644 --- a/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp +++ b/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp @@ -150,8 +150,6 @@ void tst_QMessageBox::sanityTest() QSKIP("Test hangs on macOS 10.12 -- QTQAINFRA-1362"); return; } -#elif defined(Q_OS_WINRT) - QSKIP("Test hangs on winrt -- QTBUG-68297"); #endif QMessageBox msgBox; msgBox.setText("This is insane"); diff --git a/tests/auto/widgets/dialogs/qsidebar/tst_qsidebar.cpp b/tests/auto/widgets/dialogs/qsidebar/tst_qsidebar.cpp index 8276d3ea9d..146a9e262d 100644 --- a/tests/auto/widgets/dialogs/qsidebar/tst_qsidebar.cpp +++ b/tests/auto/widgets/dialogs/qsidebar/tst_qsidebar.cpp @@ -55,9 +55,6 @@ void tst_QSidebar::setUrls() QCOMPARE(model->rowCount(), 0); qsidebar.setUrls(urls); -#ifdef Q_OS_WINRT - QEXPECT_FAIL("", "One of the URLs is not seen as valid on WinRT - QTBUG-68297", Abort); -#endif QCOMPARE(qsidebar.urls(), urls); QCOMPARE(model->rowCount(), urls.count()); qsidebar.setUrls(urls); @@ -102,9 +99,6 @@ void tst_QSidebar::addUrls() // test < 0 qsidebar.addUrls(urls, -1); -#ifdef Q_OS_WINRT - QEXPECT_FAIL("", "One of the URLs is not seen as valid on WinRT - QTBUG-68297", Abort); -#endif QCOMPARE(model->rowCount(), 2); // test = 0 @@ -192,9 +186,6 @@ void tst_QSidebar::goToUrl() QSignalSpy spy(&qsidebar, SIGNAL(goToUrl(QUrl))); QTest::mousePress(qsidebar.viewport(), Qt::LeftButton, {}, qsidebar.visualRect(qsidebar.model()->index(0, 0)).center()); -#ifdef Q_OS_WINRT - QEXPECT_FAIL("", "Fails on WinRT - QTBUG-68297", Abort); -#endif QCOMPARE(spy.count(), 1); QCOMPARE((spy.value(0)).at(0).toUrl(), urls.first()); } diff --git a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp index 5b7ded0ecb..a522dc4122 100644 --- a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp +++ b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp @@ -2596,9 +2596,6 @@ void tst_QWizard::task161658_alignments() void tst_QWizard::task177022_setFixedSize() { -#ifdef Q_OS_WINRT - QSKIP("Widgets cannot have a fixed size on WinRT."); -#endif int width = 300; int height = 200; QWizard wiz; |