diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2017-09-22 15:45:38 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-22 21:31:07 +0000 |
| commit | c23b274ee5b4db605ff1f51f9d91b290e60ab359 (patch) | |
| tree | 0225158ce7e9e9ff9bb1356fe6a0409fd6b539da /configure.json | |
| parent | 9fdc847c639ef7060a13b10d9fe704e40357a0a8 (diff) | |
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>
Diffstat (limited to 'configure.json')
| -rw-r--r-- | configure.json | 7 |
1 files changed, 4 insertions, 3 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", |