From 903f643c501a41473e0c8f4f8bd78fa4a52bcd7d Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Wed, 17 Feb 2021 18:08:25 +0100 Subject: Remove Windows 7 VM workaround from rhi init There is no longer a Windows 7 configuration in CI. Change-Id: Ic190735301f03e84974132ed1183adfd9352187a Reviewed-by: Andy Nichols (cherry picked from commit 4d9d5ab8187a2e1391afdcd0716bd43196040984) Reviewed-by: Qt Cherry-pick Bot --- src/quick/scenegraph/qsgrhisupport.cpp | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/quick/scenegraph/qsgrhisupport.cpp b/src/quick/scenegraph/qsgrhisupport.cpp index 189cf0cba8..88bbf77e40 100644 --- a/src/quick/scenegraph/qsgrhisupport.cpp +++ b/src/quick/scenegraph/qsgrhisupport.cpp @@ -231,17 +231,7 @@ void QSGRhiSupport::applySettings() void QSGRhiSupport::adjustToPlatformQuirks() { -#if defined(Q_OS_WIN) - // Temporary Windows 7 workaround: no D3D. Just stick with OpenGL like Qt 5 - // would. Can be removed when Win 7 support is finally dropped from Qt 6. - // (but as long as we have a Win 7 CI, this is mandatory) - if (QOperatingSystemVersion::current() <= QOperatingSystemVersion::Windows7) { - if (m_rhiBackend == QRhi::D3D11) { - qCDebug(QSG_LOG_INFO, "D3D on Windows 7 is not supported. Trying OpenGL instead."); - m_rhiBackend = QRhi::OpenGLES2; - } - } -#elif defined(Q_OS_MACOS) || defined(Q_OS_IOS) +#if defined(Q_OS_MACOS) || defined(Q_OS_IOS) // ### For now just create a throwaway QRhi instance. This will be replaced // by a more lightweight way, once a helper function is added gui/rhi. -- cgit v1.2.3