diff --git a/config.tests/winversion/winversion.cpp b/config.tests/winversion/winversion.cpp index 32748e02cbc4da274a060d0ad6d9734b6949cb39..4d117b9455d52176fb9de7a6b79d3c3a61e3fcdf 100644 --- a/config.tests/winversion/winversion.cpp +++ b/config.tests/winversion/winversion.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ #if !defined(__clang__) && _MSC_FULL_VER < 191125507 -#error VS 2017 Update 3.2 or higher is required +#error unsupported Visual Studio version #endif int main(int, char **) diff --git a/mkspecs/features/platform.prf b/mkspecs/features/platform.prf index 7f6cc2e3eed8cb0d161e262090589a667c17d762..2c8ef43a519cc416bcd45366fb42db35f545ad72 100644 --- a/mkspecs/features/platform.prf +++ b/mkspecs/features/platform.prf @@ -34,7 +34,7 @@ defineTest(isPlatformSupported) { return(false) } !qtConfig(webengine-winversion) { - skipBuild("Needs VS 2017 Update 3.2 with Cumulative Servicing Release or higher") + skipBuild("Needs Visual Studio 2017 or higher") return(false) } } else:osx { diff --git a/src/core/config/windows.pri b/src/core/config/windows.pri index f74e0bb8592f7f0beb7686b6302509dec5a78487..b3e4cf77d2ea04982bdc6249435ce8d1be7f7187 100644 --- a/src/core/config/windows.pri +++ b/src/core/config/windows.pri @@ -54,9 +54,7 @@ msvc:contains(QT_ARCH, "i386"):!usingMSVC32BitCrossCompiler() { } msvc { - equals(MSVC_VER, 14.0) { - MSVS_VERSION = 2015 - } else:equals(MSVC_VER, 15.0) { + equals(MSVC_VER, 15.0) { MSVS_VERSION = 2017 } else { fatal("Visual Studio compiler version \"$$MSVC_VER\" is not supported by Qt WebEngine") diff --git a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc index 6a93305832a891328942e73f6a5d260e9de6ab80..5d7c7056006d5fb512fd899041f85cdedd9e4b33 100644 --- a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc +++ b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc @@ -69,7 +69,7 @@ \section2 Windows - On Windows, Visual Studio 2015 or 2017 and Windows 10 SDK are required. + On Windows, Visual Studio 2017 and Windows 10 SDK are required. \section2 Linux