diff options
| author | Oliver Wolff <oliver.wolff@qt.io> | 2020-11-02 07:58:06 +0100 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@qt.io> | 2021-08-09 10:59:19 +0200 |
| commit | e66132194084060f6c3590668d0e1cb91737b177 (patch) | |
| tree | ca0665a5cc8a625b7415d656941e67865b52a29f /tests | |
| parent | 92cf7354066b7e564f4f8d16f612b087fc585b0f (diff) | |
Remove Windows 7 codepaths
Task-number: QTBUG-84432
Change-Id: I623b45de6db5060516c0bec30a1e4c1ecbe8374d
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit d10cc557e295ec10486db7e674d87e4fd4143551)
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'tests')
4 files changed, 2 insertions, 10 deletions
diff --git a/tests/auto/quick/qquickrendercontrol/tst_qquickrendercontrol.cpp b/tests/auto/quick/qquickrendercontrol/tst_qquickrendercontrol.cpp index 539ac25adb..ee0d9d271e 100644 --- a/tests/auto/quick/qquickrendercontrol/tst_qquickrendercontrol.cpp +++ b/tests/auto/quick/qquickrendercontrol/tst_qquickrendercontrol.cpp @@ -128,8 +128,7 @@ void tst_RenderControl::renderAndReadBackWithRhi_data() QTest::newRow("Vulkan") << QSGRendererInterface::VulkanRhi; #endif #ifdef Q_OS_WIN - if (QOperatingSystemVersion::current() > QOperatingSystemVersion::Windows7) - QTest::newRow("D3D11") << QSGRendererInterface::Direct3D11Rhi; + QTest::newRow("D3D11") << QSGRendererInterface::Direct3D11Rhi; #endif #if defined(Q_OS_MACOS) || defined(Q_OS_IOS) QTest::newRow("Metal") << QSGRendererInterface::MetalRhi; diff --git a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp index 3369435bce..edfe487c5e 100644 --- a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp +++ b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp @@ -3684,8 +3684,7 @@ void tst_qquickwindow::rendererInterfaceWithRenderControl_data() QTest::newRow("Vulkan") << QSGRendererInterface::VulkanRhi; #endif #ifdef Q_OS_WIN - if (QOperatingSystemVersion::current() > QOperatingSystemVersion::Windows7) - QTest::newRow("D3D11") << QSGRendererInterface::Direct3D11Rhi; + QTest::newRow("D3D11") << QSGRendererInterface::Direct3D11Rhi; #endif #if defined(Q_OS_MACOS) || defined(Q_OS_IOS) QTest::newRow("Metal") << QSGRendererInterface::MetalRhi; diff --git a/tests/auto/quickcontrols2/qquickapplicationwindow/tst_qquickapplicationwindow.cpp b/tests/auto/quickcontrols2/qquickapplicationwindow/tst_qquickapplicationwindow.cpp index f6bf7d74d8..fa42d81a79 100644 --- a/tests/auto/quickcontrols2/qquickapplicationwindow/tst_qquickapplicationwindow.cpp +++ b/tests/auto/quickcontrols2/qquickapplicationwindow/tst_qquickapplicationwindow.cpp @@ -766,8 +766,6 @@ void tst_QQuickApplicationWindow::focusAfterPopupClosed() void tst_QQuickApplicationWindow::clearFocusOnDestruction() { - if (QOperatingSystemVersion::current() <= QOperatingSystemVersion::Windows7) - QSKIP("Test requires a version of Windows newer than 7: QTBUG-84443"); if (!canImportModule("import QtGraphicalEffects; DropShadow {}")) QSKIP("Test requires QtGraphicalEffects"); diff --git a/tests/auto/quickcontrols2/qquickpopup/tst_qquickpopup.cpp b/tests/auto/quickcontrols2/qquickpopup/tst_qquickpopup.cpp index f932d18a80..fcaa4051e3 100644 --- a/tests/auto/quickcontrols2/qquickpopup/tst_qquickpopup.cpp +++ b/tests/auto/quickcontrols2/qquickpopup/tst_qquickpopup.cpp @@ -1281,8 +1281,6 @@ void tst_QQuickPopup::countChanged() // QTBUG-73243 void tst_QQuickPopup::toolTipCrashOnClose() { - if (QOperatingSystemVersion::current() <= QOperatingSystemVersion::Windows7) - QSKIP("Test requires a version of Windows newer than 7: QTBUG-84443"); if (!canImportModule("import QtGraphicalEffects; DropShadow {}")) QSKIP("Test requires QtGraphicalEffects"); @@ -1302,8 +1300,6 @@ void tst_QQuickPopup::toolTipCrashOnClose() void tst_QQuickPopup::setOverlayParentToNull() { - if (QOperatingSystemVersion::current() <= QOperatingSystemVersion::Windows7) - QSKIP("Test requires a version of Windows newer than 7: QTBUG-84443"); if (!canImportModule("import QtGraphicalEffects; DropShadow {}")) QSKIP("Test requires QtGraphicalEffects"); |