diff options
| -rw-r--r-- | mkspecs/devices/common/linux_device_pre.conf | 2 | ||||
| -rw-r--r-- | mkspecs/features/qt_functions.prf | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/mkspecs/devices/common/linux_device_pre.conf b/mkspecs/devices/common/linux_device_pre.conf index cfbdc23d63..8c6c87d0b7 100644 --- a/mkspecs/devices/common/linux_device_pre.conf +++ b/mkspecs/devices/common/linux_device_pre.conf @@ -25,4 +25,4 @@ QMAKE_NM = $${CROSS_COMPILE}nm -P QMAKE_STRIP = $${CROSS_COMPILE}strip contains(DISTRO_OPTS, deb-multi-arch): \ - PKG_CONFIG = $${CROSS_COMPILE}pkg-config + QMAKE_PKG_CONFIG = $${CROSS_COMPILE}pkg-config diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index f1982d6e4e..82349be85e 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -215,7 +215,10 @@ defineTest(qtAddTargetEnv) { defineReplace(pkgConfigExecutable) { isEmpty(PKG_CONFIG) { - PKG_CONFIG = pkg-config + !isEmpty(QMAKE_PKG_CONFIG): \ + PKG_CONFIG = $$QMAKE_PKG_CONFIG + else: \ + PKG_CONFIG = pkg-config sysroot.name = PKG_CONFIG_SYSROOT_DIR sysroot.value = $$PKG_CONFIG_SYSROOT_DIR |