From 349ae21b3758bff6c8cf3a9a143efd4eed9e12d0 Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Thu, 22 Aug 2019 15:04:06 +0200
Subject: [PATCH] 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>
---
src/buildtools/configure.json | 10 ++++++++--
1 file 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": {
@@ -656,6 +657,11 @@
"condition": "config.linux && !features.webengine-ozone-x11 && features.xcb",
"message": "Could not find all necessary libraries for qpa-xcb support."
},
+ {
+ "type": "warning",
+ "condition": "config.win32 && !features.webengine-winversion",
+ "message": "Needs Visual Studio 2017 or higher."
+ },
{
"type": "warning",
"condition": "config.win32 && !features.webengine-win-compiler64",
--
GitLab