summaryrefslogtreecommitdiffstats
path: root/configure.json
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2018-04-04 12:26:52 +0200
committerMichal Klocek <michal.klocek@qt.io>2018-04-12 07:14:38 +0000
commit98cfb5cee9fb7bdf9c1ede396c786be2ad0c4b33 (patch)
tree4269f2ca157f8da195dae24c5e93d27ea39eb4c5 /configure.json
parent7ad9ffe57aec62b7170e077a5bfc989e69703494 (diff)
Add check for catalog support in libxml2
Since https://codereview.chromium.org/2788063002 libxml2 is expected to have disabled catalog support. Prevent crashes of render process and do not link against system libxml2 if it is compiled with catalog support. Task-number: QTBUG-66488 Change-Id: I2d922929878262c555802336841536eba1294db2 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'configure.json')
-rw-r--r--configure.json14
1 files changed, 11 insertions, 3 deletions
diff --git a/configure.json b/configure.json
index ce12b05b6..d1ae781a6 100644
--- a/configure.json
+++ b/configure.json
@@ -288,9 +288,14 @@
"label": "glibc > 2.16",
"type": "detectGlibc"
},
- "webengine-icuuc": {
+ "webengine-libxml2-with-icuuc": {
"label" : "libxml2 configured with icuuc",
- "type": "detectIcuuc"
+ "type": "detectLibXml2WithIcuuc"
+ },
+ "webengine-libxml2-without-catalog-support": {
+ "label" : "libxml2 configured without catalog support",
+ "test" : "xml2",
+ "type": "compile"
},
"webengine-sanitizer": {
"label" : "sanitizer support",
@@ -580,7 +585,10 @@
},
"webengine-system-libxml2": {
"label": "libxml2 and libxslt",
- "condition": "config.unix && libs.webengine-libxml2 && tests.webengine-icuuc",
+ "condition": "config.unix
+ && libs.webengine-libxml2
+ && tests.webengine-libxml2-with-icuuc
+ && tests.webengine-libxml2-without-catalog-support",
"output": [ "privateFeature" ]
},
"webengine-system-lcms2" : {