diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-26 18:33:02 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-01-26 19:40:45 +0000 |
| commit | f3060312c89344744832e3352fe4f53efcb94c9b (patch) | |
| tree | de69be5e25a1acd3207a8952376f634fe94fefcc /mkspecs/features | |
| parent | c29d3692d700f7ef6d5833242878b4ec6f81c928 (diff) | |
| parent | a15c3d086dafea83e4760f0b447be43d26b80697 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/qt_functions.prf | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index f1982d6e4e..b2c2507807 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -215,12 +215,16 @@ 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 libdir.name = PKG_CONFIG_LIBDIR libdir.value = $$PKG_CONFIG_LIBDIR + QT_TOOL_NAME = pkg-config qtAddToolEnv(PKG_CONFIG, sysroot libdir, SYS) } |