summaryrefslogtreecommitdiffstats
path: root/configure.json
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2017-09-19 16:12:51 +0200
committerMichal Klocek <michal.klocek@qt.io>2017-09-20 10:43:22 +0000
commit89bc0ad2d10f2c866a111965cd3805b70a9fd728 (patch)
tree2ad0e84bf2bb214f22a7ce7bcefcb8c0734ff4ba /configure.json
parent24a72329a69f82881bf2624cb76b31f798ca08b3 (diff)
Fix system-harfbuzz and system-png detection
Import gui-private to check for system-png and system-harfbuzz. Change-Id: I26fe98ce3de1f6af8015228260e8ef74952e816e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'configure.json')
-rw-r--r--configure.json5
1 files changed, 3 insertions, 2 deletions
diff --git a/configure.json b/configure.json
index c89012352..3210c60fb 100644
--- a/configure.json
+++ b/configure.json
@@ -1,6 +1,7 @@
{
"module": "webengine",
"depends": [
+ "gui-private",
"printsupport"
],
@@ -290,7 +291,7 @@
},
"webengine-system-harfbuzz": {
"label": "harfbuzz",
- "condition": "libs.harfbuzz",
+ "condition": "config.unix && features.system-harfbuzz && libs.harfbuzz",
"output": [ "privateFeature" ]
},
"system-glib" : {
@@ -325,7 +326,7 @@
},
"webengine-system-png" : {
"label": "png",
- "condition": "config.unix && libs.png",
+ "condition": "config.unix && features.system-png && libs.png",
"output": [ "privateFeature" ]
},
"python2": {