From 24a72329a69f82881bf2624cb76b31f798ca08b3 Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Tue, 19 Sep 2017 15:58:27 +0200
Subject: [PATCH] Fix pkg-config call in icu test
The call had the side effect of generating extra pkg-config-wrapper.sh
in root of the build. Use different pkg-config call.
Change-Id: I8335ae55547272924802f3903ce6bba903389b62
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
configure.pri | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.pri b/configure.pri
index 0b6f9fd1b..1765e32e3 100644
--- a/configure.pri
+++ b/configure.pri
@@ -148,7 +148,7 @@ defineTest(qtConfTest_embedded) {
}
defineTest(qtConfTest_detectIcuuc) {
- pkgConfig = $$first($$list($$pkgConfigExecutable()))
+ pkgConfig = $$qtConfPkgConfig()
!isEmpty(pkgConfig) {
qtRunLoggedCommand("$$pkgConfig --libs --static libxml-2.0", xmllibs)
contains(xmllibs,".*-licuuc.*"):return(true)
--
GitLab