diff options
author | Michal Klocek <michal.klocek@qt.io> | 2017-11-13 13:43:32 +0100 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2017-11-22 07:58:57 +0000 |
commit | beb152924667f10059b8aa7354a07e04ac25d8cd (patch) | |
tree | 8417066eabaf65422a19953bb67e5670a7dfd9ff | |
parent | 0bcff4da6a22acdc522e7c27607ad4d2a2ffe843 (diff) |
Add missing 'webengine' prefix in configure.json
Fix condition mixup in webengine-system-lcms2 configuration
Change-Id: Iff8513b1e1102c3ca6402b2ec346dfdded2c110a
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r-- | configure.json | 4 | ||||
-rw-r--r-- | src/core/config/linux.pri | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/configure.json b/configure.json index d0d172835..398df0ce9 100644 --- a/configure.json +++ b/configure.json @@ -529,8 +529,8 @@ }, "webengine-system-lcms2" : { "label": "lcms2", - "autoDetect": "libs.webengine-lcms2", - "condition": "config.unix && features.printing-and-pdf", + "autoDetect": "features.webengine-printing-and-pdf", + "condition": "config.unix && libs.webengine-lcms2", "output": [ "privateFeature" ] }, "webengine-sanitizer" : { diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index c5329dfcc..fd22c880f 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -117,7 +117,7 @@ host_build { qtConfig(webengine-system-zlib): qtConfig(webengine-system-minizip) { gn_args += use_system_zlib=true use_system_minizip=true - qtConfig(printing-and-pdf): gn_args += pdfium_use_system_zlib=true + qtConfig(webengine-printing-and-pdf): gn_args += pdfium_use_system_zlib=true } qtConfig(webengine-system-png): gn_args += use_system_libpng=true qtConfig(system-jpeg): gn_args += use_system_libjpeg=true |