From 985c3d474b8388fb057159916589ad1eabf8a7fe Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 6 Feb 2015 17:19:04 +0100 Subject: [PATCH] make use of qtAddToolEnv() in pkgConfigExecutable() Change-Id: I60e86ac869f670258c82520072836cdfff3b2dc2 Reviewed-by: Mark Brand --- mkspecs/features/qt_functions.prf | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index 40dd9033dd..ff1f5f8940 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -305,15 +305,11 @@ defineReplace(pkgConfigExecutable) { isEmpty(PKG_CONFIG) { PKG_CONFIG = pkg-config - !isEmpty(PKG_CONFIG_SYSROOT_DIR) { - win32:isEmpty(MINGW_IN_SHELL):PKG_CONFIG = set PKG_CONFIG_SYSROOT_DIR=$$PKG_CONFIG_SYSROOT_DIR& $$PKG_CONFIG - else:PKG_CONFIG = PKG_CONFIG_SYSROOT_DIR=\"$$PKG_CONFIG_SYSROOT_DIR\" $$PKG_CONFIG - } - - !isEmpty(PKG_CONFIG_LIBDIR) { - win32:isEmpty(MINGW_IN_SHELL):PKG_CONFIG = set PKG_CONFIG_LIBDIR=$$PKG_CONFIG_LIBDIR& $$PKG_CONFIG - else:PKG_CONFIG = PKG_CONFIG_LIBDIR=\"$$PKG_CONFIG_LIBDIR\" $$PKG_CONFIG - } + sysroot.name = PKG_CONFIG_SYSROOT_DIR + sysroot.value = $$PKG_CONFIG_SYSROOT_DIR + libdir.name = PKG_CONFIG_LIBDIR + libdir.value = $$PKG_CONFIG_LIBDIR + qtAddToolEnv(PKG_CONFIG, sysroot libdir, SYS) } equals(QMAKE_HOST.os, Windows): \