diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-03-07 07:37:11 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-03-12 14:17:33 +0000 |
| commit | da95548bab8e8981ae33843438bc205c4e14aea0 (patch) | |
| tree | 5524d18bfc9615e0e479f38522c2228e329228da | |
| parent | 989a6f33a165c6f793639ea34fc30fe6210c0181 (diff) | |
Clarify Windows build requirements
[ChangeLog][QtWebEngine] QtWebEngine requires Visual Studio 2017.
Task-number: QTBUG-66596
Change-Id: Ib9961afef17bc095bdf983cb06981e16963157c1
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | config.tests/winversion/winversion.cpp | 2 | ||||
| -rw-r--r-- | mkspecs/features/platform.prf | 2 | ||||
| -rw-r--r-- | src/core/config/windows.pri | 4 | ||||
| -rw-r--r-- | src/webengine/doc/src/qtwebengine-platform-notes.qdoc | 2 |
4 files changed, 4 insertions, 6 deletions
diff --git a/config.tests/winversion/winversion.cpp b/config.tests/winversion/winversion.cpp index 32748e02c..4d117b945 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 7f6cc2e3e..2c8ef43a5 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 f74e0bb85..b3e4cf77d 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 6a9330583..5d7c70560 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 |