diff --git a/configure.json b/configure.json index 3210c60fb44360bf1461465b2acde5cd21d9d3d2..c623ebe87df9a4eca2d2412c1eff50a74a471b63 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 a2361b02f35e4a6eefb2e96cfa5923ac39993bf5..78f3e5093eaca47b649a044aba8af07db21dd264 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