diff options
| author | Milian Wolff <milian.wolff@kdab.com> | 2012-11-19 15:53:57 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-21 16:36:50 +0100 |
| commit | a0ac93c73d1dd13406980fc3b8beb1f8127650ea (patch) | |
| tree | 6f763b429af5d3cb4df47a71a6ca4dc38ed90425 | |
| parent | 91abfd521a1c719d7dc68e562a5486fc206b1f32 (diff) | |
packagesExist(): always return false if QT_CONFIG contains no-pkg-config
On QNX e.g. you'll end up with a Qt configured without pkg-config support
by default. Once you try to compile e.g. QtWebKit which contains a check
like packagesExist(libudev) the system pkg-config (see default branch
of pkgConfigExecutable) will be called without any special config sysroot
or libdir. Thus libudev will be found in your system host, even though
it is not available for the cross compile target. This leads to compile
errors as described in https://bugs.webkit.org/show_bug.cgi?id=98032 .
Change-Id: If1474cb3b3f3b71fad7269e4aedd4e10f70a9b2a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| -rw-r--r-- | mkspecs/features/qt_functions.prf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index 2998bb93ae..ac3bdaca96 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -280,10 +280,11 @@ defineReplace(pkgConfigExecutable) { } defineTest(packagesExist) { + contains(QT_CONFIG, no-pkg-config):return(false) + # this can't be done in global scope here because qt_functions is loaded # before the .pro is parsed, so if the .pro set PKG_CONFIG, we wouldn't know it # yet. oops. - pkg_config = $$pkgConfigExecutable() for(package, ARGS) { |