diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-06-25 11:30:54 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-07-01 11:50:03 +0200 |
| commit | 094844dacd40b37e0233d7fb185caff88e31f004 (patch) | |
| tree | 2754969e0e7abcd1794069b4796d70119b90dbda /tools | |
| parent | 9d5d883b8182b8e6cb46f0b305e57f701f818aa4 (diff) | |
Unbundle zlib, minizip, libxml2 and libxslt on Linux
If available use the system versions of these basic libraries on Linux.
Change-Id: Iebcd5c11c53d0d491c457ccff71be04f8b2cac1c
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qmake/mkspecs/features/configure.prf | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf index 7b111b78f..ffbef84d9 100644 --- a/tools/qmake/mkspecs/features/configure.prf +++ b/tools/qmake/mkspecs/features/configure.prf @@ -27,6 +27,14 @@ defineTest(runConfigure) { !packagesExist($$package):skipBuild("Unmet dependency: $$package") } } + + linux { + packagesExist(minizip, zlib): CONFIG += config_system_minizip + else: log("System zlib and minizip not found. Using Chromium's copies.$${EOL}") + packagesExist(libxml-2.0,libxslt): CONFIG += config_system_libxslt + else: log("System libxml2 and libxslt not found. Using Chromium's copies.$${EOL}") + } + isEmpty(skipBuildReason):cache(CONFIG, add, $$list(webengine_successfully_configured)) } |