From bcd0653e10f86b5f9280151684e452fd6de1f36a Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 15 Jul 2016 18:26:55 +0200 Subject: [PATCH] fix exit paths when pkg-config is not found 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 --- mkspecs/features/qt_configure.prf | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf index b3a47a7709..07338ffe9d 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -316,8 +316,6 @@ defineReplace(qtConfPkgConfig) { $$host { pkg_config = $$qtConfFindInPath("pkg-config") - isEmpty(pkg_config): \ - return(false) } else { pkg_config = "$$qtConfPkgConfigEnv()$$PKG_CONFIG" } @@ -345,6 +343,8 @@ defineReplace(qtConfPrepareArgs) { defineTest(qtConfTest_pkgConfig) { pkg_config = $$qtConfPkgConfig($$eval($${1}.host)) + isEmpty(pkg_config): \ + return(false) args = $$qtConfPrepareArgs($$eval($${1}.pkg-config-args)) !qtConfPkgConfigPackageExists($$pkg_config, $$args): \ @@ -367,6 +367,8 @@ defineTest(qtConfTest_pkgConfig) { defineTest(qtConfTest_getPkgConfigVariable) { pkg_config = $$qtConfPkgConfig($$eval($${1}.host)) + isEmpty(pkg_config): \ + return(false) args = $$qtConfPrepareArgs($$eval($${1}.pkg-config-args)) !qtConfPkgConfigPackageExists($$pkg_config, $$args): \