1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix exit paths when pkg-config is not found

Browse Source 
while the previous code actually worked, it's probably more or less
coincidence that running "false" produces the correct result.

Change-Id: Ib332bd6789ac7188570ba1af4676494b4e2c9d8c
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Oswald Buddenhagen 2016-07-15 18:26:55 +02:00 committed by Lars Knoll
parent 472332559a
commit bcd0653e10
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mkspecs/features/qt_configure.prf
View File

@ -316,8 +316,6 @@ defineReplace(qtConfPkgConfig) {
$$host { $$host {
pkg_config = $$qtConfFindInPath("pkg-config") pkg_config = $$qtConfFindInPath("pkg-config")
isEmpty(pkg_config): \
return(false)
} else { } else {
pkg_config = "$$qtConfPkgConfigEnv()$$PKG_CONFIG" pkg_config = "$$qtConfPkgConfigEnv()$$PKG_CONFIG"
} }
@ -345,6 +343,8 @@ defineReplace(qtConfPrepareArgs) {
defineTest(qtConfTest_pkgConfig) { defineTest(qtConfTest_pkgConfig) {
pkg_config = $$qtConfPkgConfig($$eval($${1}.host)) pkg_config = $$qtConfPkgConfig($$eval($${1}.host))
isEmpty(pkg_config): \
return(false)
args = $$qtConfPrepareArgs($$eval($${1}.pkg-config-args)) args = $$qtConfPrepareArgs($$eval($${1}.pkg-config-args))
!qtConfPkgConfigPackageExists($$pkg_config, $$args): \ !qtConfPkgConfigPackageExists($$pkg_config, $$args): \
@ -367,6 +367,8 @@ defineTest(qtConfTest_pkgConfig) {
defineTest(qtConfTest_getPkgConfigVariable) { defineTest(qtConfTest_getPkgConfigVariable) {
pkg_config = $$qtConfPkgConfig($$eval($${1}.host)) pkg_config = $$qtConfPkgConfig($$eval($${1}.host))
isEmpty(pkg_config): \
return(false)
args = $$qtConfPrepareArgs($$eval($${1}.pkg-config-args)) args = $$qtConfPrepareArgs($$eval($${1}.pkg-config-args))
!qtConfPkgConfigPackageExists($$pkg_config, $$args): \ !qtConfPkgConfigPackageExists($$pkg_config, $$args): \