path: root/configure
diff options
authorRohan McGovern <>2011-10-12 15:49:24 +1000
committerQt by Nokia <>2011-10-12 18:01:19 +0200
commit638fc2e4c6751e6b98d18d14e149f172407205da (patch)
treeff26e0124ad41bfb8716a4a8545e88727db30a4d /configure
parent8ad18813fb701122bc3d688be02041a63ff2b579 (diff)
Do not unconditionally use pkg-config in .pro files
Using the first pkg-config in PATH is prone to errors when cross compiling. This is a known issue, and `configure' already avoids using pkg-config for cross compiling (unless -force-pkg-config is used). However, there was previously no way for a .pro file to test whether or not the user had passed -force-pkg-config. Let !contains(QT_CONFIG, no-pkg-config) be used to test whether or not it is safe to run pkg-config. (cherry picked from commit 53794d94994cb3149581b1a91762dfa2d6defac0) Change-Id: I53794d94994cb3149581b1a91762dfa2d6defac0 Reviewed-by: Sergio Ahumada <> Reviewed-on: Reviewed-by: Rohan McGovern <>
Diffstat (limited to 'configure')
1 files changed, 4 insertions, 0 deletions
diff --git a/configure b/configure
index c11ab76f2c..708d7404e9 100755
--- a/configure
+++ b/configure
@@ -3298,6 +3298,10 @@ if [ "$QT_CROSS_COMPILE" = "yes" ]; then
+if [ ! -n "$PKG_CONFIG" ]; then
+ QT_CONFIG="$QT_CONFIG no-pkg-config"
# process CFG_MAC_ARCHS
if [ "$PLATFORM_MAC" = "yes" ]; then
# check -arch arguments for validity.