diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-10-26 13:42:24 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-10-26 13:29:35 +0000 |
| commit | ed99ffdc32270633058eed45d64ccceea9b9de4f (patch) | |
| tree | 4557fdb84ad33dd343bfcdb2338855eff3a505fe /mkspecs | |
| parent | 99331f661d6ef88f9bb964133ee4eaf8b6d74e80 (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 <oswald.buddenhagen@qt.io>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt_configure.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf index e8fa0c6f76..7118a177fe 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -376,7 +376,7 @@ defineReplace(qtConfPkgConfig) { $$host { pkg_config = $$qtConfFindInPath("pkg-config") } else { - pkg_config = "$$qtConfPkgConfigEnv()$$PKG_CONFIG" + pkg_config = "$$qtConfPkgConfigEnv()$$PKG_CONFIG_EXECUTABLE" } return($$pkg_config) |