diff options
| -rw-r--r-- | configure.pri | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/configure.pri b/configure.pri index 21ceb68d33..8c87aaed81 100644 --- a/configure.pri +++ b/configure.pri @@ -191,9 +191,6 @@ defineTest(qtConfTest_detectPkgConfig) { $${1}.cache += pkgConfig export($${1}.cache) - PKG_CONFIG = $$pkgConfig - export(PKG_CONFIG) - return(true) } @@ -526,6 +523,8 @@ defineTest(qtConfOutput_qreal) { defineTest(qtConfOutput_pkgConfig) { !$${2}: return() + PKG_CONFIG = $$eval(config.tests.pkg-config.pkgConfig) + export(PKG_CONFIG) # this method also exports PKG_CONFIG_(LIB|SYSROOT)DIR, so that tests using pkgConfig will work correctly PKG_CONFIG_SYSROOT_DIR = $$eval(config.tests.pkg-config.pkgConfigSysrootDir) !isEmpty(PKG_CONFIG_SYSROOT_DIR) { |