From 1de18504fa524a49dffe808164fe8f8187b4ffab Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Thu, 22 Aug 2019 11:19:50 +0200 Subject: Add platform and architecture to configure Make configure system aware of platform and architecture checks. Task-number: QTBUG-75840 Task-number: QTBUG-76606 Change-Id: I8d2c9dd863ee2c4a3015ad8147f43dc788cfd72d Reviewed-by: Allan Sandfeld Jensen --- mkspecs/features/functions.prf | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'mkspecs/features/functions.prf') diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf index ec78a59cb..7617005ea 100644 --- a/mkspecs/features/functions.prf +++ b/mkspecs/features/functions.prf @@ -104,8 +104,8 @@ defineTest(skipBuild) { defineTest(isWebEngineCoreBuild) { - static{ - skipBuild("Static builds of QtWebEngine aren't supported.") + static { + skipBuild("Static builds of QtWebEngine are not supported.") return(false) } @@ -149,6 +149,11 @@ defineTest(isWebEngineCoreBuild) { return(false) } + win32:!qtConfig(webengine-winversion) { + skipBuild("Needs Visual Studio 2017 or higher") + return(false) + } + !qtConfig(webengine-gperf) { skipBuild("Required gperf could not be found.") return(false) -- cgit v1.2.3