diff options
| -rw-r--r-- | src/core/config/desktop_linux.pri | 2 | ||||
| -rw-r--r-- | src/core/config/embedded_linux.pri | 2 | ||||
| -rw-r--r-- | tools/qmake/mkspecs/features/configure.prf | 8 |
3 files changed, 12 insertions, 0 deletions
diff --git a/src/core/config/desktop_linux.pri b/src/core/config/desktop_linux.pri index 803a5fe82..2ebd6b995 100644 --- a/src/core/config/desktop_linux.pri +++ b/src/core/config/desktop_linux.pri @@ -17,6 +17,8 @@ GYP_CONFIG += \ clang=0 \ enable_plugins=1 \ +config_system_libxslt: GYP_CONFIG += use_system_libxml=1 +contains(QT_CONFIG, system-zlib): config_system_minizip: GYP_CONFIG += use_system_zlib=1 contains(QT_CONFIG, system-png): GYP_CONFIG += use_system_libpng=1 contains(QT_CONFIG, system-jpeg): GYP_CONFIG += use_system_libjpeg=1 diff --git a/src/core/config/embedded_linux.pri b/src/core/config/embedded_linux.pri index d902d8086..5c7914768 100644 --- a/src/core/config/embedded_linux.pri +++ b/src/core/config/embedded_linux.pri @@ -49,6 +49,8 @@ GYP_CONFIG += \ v8_use_snapshot=false \ want_separate_host_toolset=1 \ +config_system_libxslt: GYP_CONFIG += use_system_libxml=1 +contains(QT_CONFIG, system-zlib): config_system_minizip: GYP_CONFIG += use_system_zlib=1 contains(QT_CONFIG, system-png): GYP_CONFIG += use_system_libpng=1 contains(QT_CONFIG, system-jpeg): GYP_CONFIG += use_system_libjpeg=1 !contains(QT_CONFIG, pulseaudio): GYP_CONFIG += use_pulseaudio=0 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)) } |