From 61e35009aa276e9d2d7ff1787b52ba06f8cde37f Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Wed, 19 Apr 2017 10:36:48 +0200
Subject: [PATCH] Fixup libxml with ICU detection
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>
---
tools/qmake/mkspecs/features/configure.prf | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf
index 6e61f2206..55a7c45a4 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}")
--
GitLab