Commit f6c1a349 authored by Allan Sandfeld Jensen's avatar Allan Sandfeld Jensen
Browse files

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: default avatarFlorian Bruhin <qt-project.org@the-compiler.org>
Reviewed-by: default avatarViktor Engelmann <viktor.engelmann@qt.io>
Reviewed-by: default avatarMichael Brüning <michael.bruning@qt.io>
Showing with 8 additions and 1 deletion
......@@ -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
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment