From 1adf4a86836d334406bd796480d70623d038d040 Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Fri, 8 May 2020 10:58:58 +0200 Subject: rendercontrol autotest: skip D3D on Win7 Unlike other Qt Quick tests, this one has its own logic for exercising the available QRhi backends (so similar to what tst_qrhi does in qtbase). Adjust it according to our current understanding (that we cannot use D3D in the Windows 7 VM of the CI). Change-Id: Ic6d78219c7bd6b8fbbefe363534b8915e64482df Reviewed-by: Jonas Karlsson Reviewed-by: Eirik Aavitsland --- tests/auto/quick/qquickrendercontrol/tst_qquickrendercontrol.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'tests/auto/quick/qquickrendercontrol') diff --git a/tests/auto/quick/qquickrendercontrol/tst_qquickrendercontrol.cpp b/tests/auto/quick/qquickrendercontrol/tst_qquickrendercontrol.cpp index 44c568068d..c879684592 100644 --- a/tests/auto/quick/qquickrendercontrol/tst_qquickrendercontrol.cpp +++ b/tests/auto/quick/qquickrendercontrol/tst_qquickrendercontrol.cpp @@ -51,6 +51,8 @@ #include #endif +#include + class AnimationDriver : public QAnimationDriver { public: @@ -124,7 +126,8 @@ void tst_RenderControl::renderAndReadBackWithRhi_data() QTest::newRow("Vulkan") << QSGRendererInterface::VulkanRhi; #endif #ifdef Q_OS_WIN - QTest::newRow("D3D11") << QSGRendererInterface::Direct3D11Rhi; + if (QOperatingSystemVersion::current() > QOperatingSystemVersion::Windows7) + QTest::newRow("D3D11") << QSGRendererInterface::Direct3D11Rhi; #endif #if defined(Q_OS_MACOS) || defined(Q_OS_IOS) QTest::newRow("Metal") << QSGRendererInterface::MetalRhi; -- cgit v1.2.3