diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-12 19:39:58 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-12 19:39:58 +0100 |
| commit | 60f2cfe39ab2822bcc3b86453d8b05cc76d56961 (patch) | |
| tree | 6a5ad24326b48cc965eab4c4af1fcf4b3e2c6097 /src/core/config/linux.pri | |
| parent | 271e3cd4f23539382a5f9ea4f5a29f500584da5b (diff) | |
| parent | 9dc8dff7a8f4d58f71d816375d49f8829f06aae5 (diff) | |
Merge remote-tracking branch 'origin/5.10.1' into 5.11
Change-Id: If971fbfcb158c921e2328dfcdef3bd3322f30c4b
Diffstat (limited to 'src/core/config/linux.pri')
| -rw-r--r-- | src/core/config/linux.pri | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index f4a95a03c..f3103e749 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -112,12 +112,12 @@ host_build { PKG_CONFIG_HOST = $$(GN_PKG_CONFIG_HOST) pkgConfigLibDir = $$(PKG_CONFIG_LIBDIR) pkgConfigSysrootDir = $$(PKG_CONFIG_SYSROOT_DIR) - isEmpty(PKG_CONFIG_HOST): PKG_CONFIG_HOST = $$QMAKE_PKG_CONFIG_HOST - cross_compile { + isEmpty(PKG_CONFIG_HOST): cross_compile { !isEmpty(pkgConfigLibDir)|!isEmpty(pkgConfigSysrootDir) { PKG_CONFIG_HOST = $$pkgConfigHostExecutable() } } + isEmpty(PKG_CONFIG_HOST): PKG_CONFIG_HOST = $$QMAKE_PKG_CONFIG_HOST gn_args += host_pkg_config=\"$$PKG_CONFIG_HOST\" } |