summaryrefslogtreecommitdiffstats
path: root/configure.json
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2018-09-25 13:09:43 +0200
committerMichal Klocek <michal.klocek@qt.io>2018-09-26 16:13:16 +0000
commitdd7c3f92c4668ed9ebdb1714d00de1cb61ab7dd4 (patch)
tree1547f7adf86b887a4a33afe472735e1c7c9e6283 /configure.json
parentc569153273dd05367962e448f053200d6338721a (diff)
Check if windows has 64 bit compiler
Task-number: QTBUG-68462 Task-number: QTBUG-70728 Change-Id: I4314bce427555504cb49de93af45c910de554479 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'configure.json')
-rw-r--r--configure.json15
1 files changed, 15 insertions, 0 deletions
diff --git a/configure.json b/configure.json
index 6cb7d3fbb..1c01c80ca 100644
--- a/configure.json
+++ b/configure.json
@@ -303,6 +303,10 @@
"webengine-sanitizer": {
"label" : "sanitizer support",
"type": "isSanitizerSupported"
+ },
+ "webengine-win-compiler64": {
+ "label": "64bit compiler",
+ "type": "isWindowsHostCompiler64"
}
},
@@ -609,6 +613,12 @@
"autoDetect": "config.sanitizer && tests.webengine-sanitizer",
"condition": "config.sanitizer",
"output": [ "privateFeature" ]
+ },
+ "webengine-win-compiler64": {
+ "label": "64bit compiler",
+ "condition": "config.win32 && tests.webengine-win-compiler64",
+ "type": "isWindowsHostCompiler64",
+ "output": [ "privateFeature" ]
}
},
@@ -642,6 +652,11 @@
"type": "warning",
"condition": "config.unix && !features.webengine-host-pkg-config",
"message": "host pkg-config not found"
+ },
+ {
+ "type": "warning",
+ "condition": "config.win32 && !features.webengine-win-compiler64",
+ "message": "64-bit cross-building or native toolchain is required to build QtWebEngine."
}
],