diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2019-08-22 15:04:06 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-09-17 17:01:59 +0000 |
| commit | 349ae21b3758bff6c8cf3a9a143efd4eed9e12d0 (patch) | |
| tree | a5eaa83146ca94c65812926ba17925fa384ca771 | |
| parent | 1de18504fa524a49dffe808164fe8f8187b4ffab (diff) | |
Add visual studio check as build requirement
Task-number: QTBUG-75840
Task-number: QTBUG-76606
Change-Id: Ic1d6125a1a6685a74dbad2f6c3b16efce120e180
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | src/buildtools/configure.json | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json index 62a9368ee..a9daad377 100644 --- a/src/buildtools/configure.json +++ b/src/buildtools/configure.json @@ -370,9 +370,10 @@ && features.webengine-gperf && features.webengine-bison && features.webengine-flex - && (!features.xcb || features.webengine-ozone-x11) && tests.webengine-platform - && tests.webengine-architecture", + && tests.webengine-architecture + && (!features.xcb || features.webengine-ozone-x11) + && (!config.win32 || features.webengine-winversion)", "output": [ "privateFeature" ] }, "webengine-python2": { @@ -658,6 +659,11 @@ }, { "type": "warning", + "condition": "config.win32 && !features.webengine-winversion", + "message": "Needs Visual Studio 2017 or higher." + }, + { + "type": "warning", "condition": "config.win32 && !features.webengine-win-compiler64", "message": "64-bit cross-building or native toolchain is required to build QtWebEngine." }, |