summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@qt.io>2021-02-17 18:08:25 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-02-19 12:49:12 +0000
commit903f643c501a41473e0c8f4f8bd78fa4a52bcd7d (patch)
tree5334d701b17b8d42c1d2b51127dc87445b1418f2
parent07049417c3c121fe8935871cee54b8f5e3deb1b1 (diff)
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 <andy.nichols@qt.io> (cherry picked from commit 4d9d5ab8187a2e1391afdcd0716bd43196040984) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/quick/scenegraph/qsgrhisupport.cpp12
1 files changed, 1 insertions, 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.