path: root/configure.pri
diff options
authorLars Knoll <>2016-10-26 13:42:24 +0200
committerLars Knoll <>2016-10-26 13:29:35 +0000
commited99ffdc32270633058eed45d64ccceea9b9de4f (patch)
tree4557fdb84ad33dd343bfcdb2338855eff3a505fe /configure.pri
parent99331f661d6ef88f9bb964133ee4eaf8b6d74e80 (diff)
Write PKG_CONFIG_EXECUTABLE to qmodule.pri
... and use that variable in qt_configure.prf to find the pkg-config we detected during qtbase configuration. This is required for modules outside of qtbase being able to use pkg-config to configure external libraries. We do not use the PKG_CONFIG variable any more, as that interferes with the $$pkgConfigExecutable() function, which some Qt modules still use. Change-Id: I8886a266207e04301009fe8207c16b02c5455b2f Reviewed-by: Oswald Buddenhagen <>
Diffstat (limited to 'configure.pri')
1 files changed, 3 insertions, 2 deletions
diff --git a/configure.pri b/configure.pri
index 7ec845375e..57c266a581 100644
--- a/configure.pri
+++ b/configure.pri
@@ -325,8 +325,9 @@ defineTest(qtConfOutput_qreal) {
defineTest(qtConfOutput_pkgConfig) {
!$${2}: return()
- PKG_CONFIG = $$eval($${currentConfig}.tests.pkg-config.pkgConfig)
- export(PKG_CONFIG)
+ PKG_CONFIG_EXECUTABLE = $$eval($${currentConfig}.tests.pkg-config.pkgConfig)
+ qtConfOutputVar(assign, "privatePro", "PKG_CONFIG_EXECUTABLE", $$PKG_CONFIG_EXECUTABLE)
# this method also exports PKG_CONFIG_(LIB|SYSROOT)DIR, so that tests using pkgConfig will work correctly
PKG_CONFIG_SYSROOT_DIR = $$eval($${currentConfig}.tests.pkg-config.pkgConfigSysrootDir)