summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2017-04-19 10:36:48 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2017-04-21 14:39:15 +0000
commit61e35009aa276e9d2d7ff1787b52ba06f8cde37f (patch)
tree12543465437c258a9d8874d49cd6f8b056fa372a
parentfa78a7800272e05e1548aaf91f8eed2353955367 (diff)
Fixup libxml with ICU detectionv5.9.0-beta3
The expression was not working, and didn't match what had been tested against. Task-number: QTBUG-60211 Change-Id: Id62e53fb2bf6483c58fd22c2745a4d1b5f141b1c Reviewed-by: Michal Klocek <michal.klocek@qt.io>
-rw-r--r--tools/qmake/mkspecs/features/configure.prf6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf
index 6e61f220..55a7c45a 100644
--- a/tools/qmake/mkspecs/features/configure.prf
+++ b/tools/qmake/mkspecs/features/configure.prf
@@ -72,11 +72,11 @@ defineTest(runConfigure) {
else: log("System opus not found. Using Chromium's copy.$${EOL}")
}
packagesExist(libxml-2.0,libxslt) {
- PKGCONFIG_LIBS_STATIC = $$system($$PKG_CONFIG --libs --static $$PKGCONFIG_LIB)
- contains(PKGCONFIG_LIBS_STATIC, icuuc) {
+ PKGCONFIG_LIBS_STATIC = $$system($$PKG_CONFIG --libs --static libxml-2.0)
+ contains(PKGCONFIG_LIBS_STATIC, -licuuc) {
WEBENGINE_CONFIG += use_system_libxslt use_system_libxml2
} else {
- log("System libxml2 or libxslt not configured with ICU. Using Chromium's copies.$${EOL}")
+ log("System libxml2 is not configured with ICU. Using Chromium's copy.$${EOL}")
}
}
else: log("System libxml2 or libxslt not found. Using Chromium's copies.$${EOL}")