From c23b274ee5b4db605ff1f51f9d91b290e60ab359 Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Fri, 22 Sep 2017 15:45:38 +0200
Subject: [PATCH] Fix system-zlib configure name collision with core
When -zlib is provided on windows for main configure line
the system-zlib feature is forced on webengine. This
is not expected since we assume zlib only for unix builds.
Prepend 'webengine' for webengine system-zlib feature.
Task-number: QTBUG-63367
Change-Id: I983d2e0df0badbaf7a076662ce178009be151406
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
configure.json | 7 ++++---
src/core/config/linux.pri | 4 +++-
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/configure.json b/configure.json
index 3210c60fb..c623ebe87 100644
--- a/configure.json
+++ b/configure.json
@@ -1,6 +1,7 @@
{
"module": "webengine",
"depends": [
+ "core-private",
"gui-private",
"printsupport"
],
@@ -304,9 +305,9 @@
"condition": "config.unix && libs.minizip",
"output": [ "privateFeature" ]
},
- "system-zlib" : {
+ "webengine-system-zlib" : {
"label": "zlib",
- "condition": "config.unix && libs.zlib",
+ "condition": "config.unix && features.system-zlib && libs.zlib",
"output": [ "privateFeature" ]
},
"system-libevent" : {
@@ -581,7 +582,7 @@
"system-snappy",
"system-libsrtp",
"system-glib",
- "system-zlib",
+ "webengine-system-zlib",
"system-minizip",
"system-libevent",
"system-jsoncpp",
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
index a2361b02f..78f3e5093 100644
--- a/src/core/config/linux.pri
+++ b/src/core/config/linux.pri
@@ -115,7 +115,9 @@ host_build {
gn_args += host_pkg_config=\"pkg-config\"
}
- qtConfig(system-zlib): qtConfig(system-minizip): gn_args += use_system_zlib=true use_system_minizip=true
+ qtConfig(webengine-system-zlib): qtConfig(system-minizip) {
+ gn_args += use_system_zlib=true use_system_minizip=true
+ }
qtConfig(webengine-system-png): gn_args += use_system_libpng=true
qtConfig(system-jpeg): gn_args += use_system_libjpeg=true
qtConfig(system-freetype): gn_args += use_system_freetype=true
--
GitLab