3 files changed, 40 insertions, 8 deletions
diff --git a/mkspecs/common/msvc-based-version.conf b/mkspecs/common/msvc-based-version.conf
new file mode 100644
index 0000000000..38aecbaf59
--- /dev/null
+++ b/mkspecs/common/msvc-based-version.conf
@@ -0,0 +1,32 @@
+#
+# qmake configuration for Compilers based on the Microsoft Visual Studio
+# C/C++ Compilers like win32-clang-msvc
+
+#
+# Version-specific changes
+#
+
+isEmpty(QMAKE_MSC_VER): error("msvc-based-version.conf loaded but QMAKE_MSC_VER isn't set")
+
+MSVC_VER = 14.0
+COMPAT_MKSPEC       = win32-msvc2015
+
+# -utf-8 compiler option for Visual Studio 2015 Update 2
+greaterThan(QMAKE_MSC_FULL_VER, 190023918):!intel_icl {
+    isEmpty(QT_CLANG_MAJOR_VERSION)|!lessThan(QT_CLANG_MAJOR_VERSION, 4) {
+        QMAKE_CFLAGS_UTF8_SOURCE = -utf-8
+    }
+}
+
+greaterThan(QMAKE_MSC_VER, 1909) {
+    # Visual Studio 2017 (15.0) / Visual C++ 19.10 and up
+    MSVC_VER            = 15.0
+    COMPAT_MKSPEC       = win32-msvc2017
+}
+
+greaterThan(QMAKE_MSC_VER, 1910) {
+    # No compat spec past MSVC 2017
+    COMPAT_MKSPEC       =
+}
+
+!isEmpty(COMPAT_MKSPEC):!$$COMPAT_MKSPEC: CONFIG += $$COMPAT_MKSPEC
diff --git a/mkspecs/common/msvc-version.conf b/mkspecs/common/msvc-version.conf
index 3fb55c9d81..de8ba56b7b 100644
--- a/mkspecs/common/msvc-version.conf
+++ b/mkspecs/common/msvc-version.conf
@@ -1,7 +1,6 @@
 #
 # qmake configuration for Microsoft Visual Studio C/C++ Compiler
-# This file is used by win32-msvc, win32-clang-msvc, and all
-# winrt-XXX-msvcXXX specs
+# This file is used by win32-msvc and all winrt-XXX-msvcXXX specs
 #
 
 #
@@ -70,11 +69,8 @@ greaterThan(QMAKE_MSC_VER, 1899) {
     QMAKE_CXXFLAGS     += -Zc:strictStrings -Zc:throwingNew
     QMAKE_CXXFLAGS_WARN_ON += -w44456 -w44457 -w44458 -wd4577 -wd4467
 
-    greaterThan(QMAKE_MSC_FULL_VER, 190023918):!intel_icl {
-        isEmpty(QT_CLANG_MAJOR_VERSION)|!lessThan(QT_CLANG_MAJOR_VERSION, 4) {
-            QMAKE_CFLAGS_UTF8_SOURCE = -utf-8
-        }
-    }
+    # -utf-8 compiler option for Visual Studio 2015 Update 2
+    greaterThan(QMAKE_MSC_FULL_VER, 190023918): QMAKE_CFLAGS_UTF8_SOURCE = -utf-8
 }
 
 greaterThan(QMAKE_MSC_VER, 1909) {
diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf
index 63f2f12e21..c7ea20e180 100644
--- a/mkspecs/features/toolchain.prf
+++ b/mkspecs/features/toolchain.prf
@@ -281,4 +281,8 @@ QMAKE_COMPILER_DEFINES += __cplusplus=$$QT_COMPILER_STDCXX
 QMAKE_CFLAGS += $$QMAKE_CFLAGS_MSVC_COMPAT
 QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_MSVC_COMPAT
 
-msvc:!intel_icl:!clang_cl: include(../common/msvc-version.conf)
+clang_cl|intel_icl {
+    include(../common/msvc-based-version.conf)
+} else: msvc {
+    include(../common/msvc-version.conf)
+}