summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2017-03-20 13:37:09 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2017-04-06 19:26:35 +0000
commitf6c1a34972eb2d9132346ab4eb442855d3ef555e (patch)
tree27ca7f988cdff09c91555a7084d0a27d3d072f9a /tools
parent1925b1afb30f119fa6c0733a36d83215b7bac8f7 (diff)
Do not use system libxml if not ICU capable
Using a libxml without ICU capability will break some websites, so better fall back to bundled libxml in that case. Task-number: QTBUG-59094 Change-Id: Ia24c4045ed9eb9731367cca07d8467ea9b785f2e Reviewed-by: Florian Bruhin <qt-project.org@the-compiler.org> Reviewed-by: Viktor Engelmann <viktor.engelmann@qt.io> Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'tools')
-rw-r--r--tools/qmake/mkspecs/features/configure.prf9
1 files changed, 8 insertions, 1 deletions
diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf
index 86665274..6e61f220 100644
--- a/tools/qmake/mkspecs/features/configure.prf
+++ b/tools/qmake/mkspecs/features/configure.prf
@@ -71,7 +71,14 @@ defineTest(runConfigure) {
packagesExist(opus): WEBENGINE_CONFIG += use_system_opus
else: log("System opus not found. Using Chromium's copy.$${EOL}")
}
- packagesExist(libxml-2.0,libxslt): WEBENGINE_CONFIG += use_system_libxslt use_system_libxml2
+ packagesExist(libxml-2.0,libxslt) {
+ PKGCONFIG_LIBS_STATIC = $$system($$PKG_CONFIG --libs --static $$PKGCONFIG_LIB)
+ contains(PKGCONFIG_LIBS_STATIC, icuuc) {
+ WEBENGINE_CONFIG += use_system_libxslt use_system_libxml2
+ } else {
+ log("System libxml2 or libxslt not configured with ICU. Using Chromium's copies.$${EOL}")
+ }
+ }
else: log("System libxml2 or libxslt not found. Using Chromium's copies.$${EOL}")
for(package, $$list("libevent jsoncpp protobuf")) {
packagesExist($$package): WEBENGINE_CONFIG += use_system_$$package