From de0f12ec709ebb8d431eaf870ba74d355d38ae85 Mon Sep 17 00:00:00 2001 From: Yuhang Zhao <2546789017@qq.com> Date: Sun, 25 Sep 2022 11:38:39 +0800 Subject: [PATCH] OpenGL: Remove pre-Win10 leftovers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Qt6's minimum supported platform is Win10 1809, and all pre-Win10 code have already been removed from QtBase long time ago. These code are trying to support Windows 7 to Windows 8.1, which nowadays become legacy code and should be removed. Change-Id: I21a979d32d99977107964bccc06fdec7b38cd727 Reviewed-by: Volker Hilsheimer Reviewed-by: Mårten Nordheim (cherry picked from commit bdadc3340c1656980983ea4acade4d781d750bef) Reviewed-by: Qt Cherry-pick Bot --- src/gui/opengl/qopengl.cpp | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/gui/opengl/qopengl.cpp b/src/gui/opengl/qopengl.cpp index d8b22050c12..edb359f6866 100644 --- a/src/gui/opengl/qopengl.cpp +++ b/src/gui/opengl/qopengl.cpp @@ -200,15 +200,6 @@ struct OsTypeTerm const auto osver = QOperatingSystemVersion::current(); #define Q_WINVER(major, minor) (major << 8 | minor) switch (Q_WINVER(osver.majorVersion(), osver.minorVersion())) { - case Q_WINVER(6, 1): - ver = QStringLiteral("7"); - break; - case Q_WINVER(6, 2): - ver = QStringLiteral("8"); - break; - case Q_WINVER(6, 3): - ver = QStringLiteral("8.1"); - break; case Q_WINVER(10, 0): ver = QStringLiteral("10"); break;