summaryrefslogtreecommitdiffstats
path: root/mkspecs/features/functions.prf
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2019-08-22 11:19:50 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2019-09-17 17:01:42 +0000
commit1de18504fa524a49dffe808164fe8f8187b4ffab (patch)
tree57857e885cc5f168a680ee21a9d014f9178c5500 /mkspecs/features/functions.prf
parentf03cd06d89ceba2b99ffb9c4ca911dc01f0bdb08 (diff)
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 <allan.jensen@qt.io>
Diffstat (limited to 'mkspecs/features/functions.prf')
-rw-r--r--mkspecs/features/functions.prf9
1 files changed, 7 insertions, 2 deletions
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)