From d0e4f28dea97252cf2e2ca317d5344e1c7a1cdfe Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 28 Jun 2016 16:14:13 +0200 Subject: pass pkg-config environment to qmake invocations qmake tries to use pkg-config when the config.test contains PKG_CONFIG, which will of course fail without the sysrooted env vars. and unlike in the old configure, these don't become automatically available by virtue of the script simply exporting them. longer-term, the test programs shouldn't mention pkg-config deps explicitly, as these are redundant with what is specified in the JSON file. relevant changes are already pending. Task-number: QTBUG-54403 Change-Id: Ie9d3bbb2e4febffde5fd122d7d0a8b70b8679fcc Reviewed-by: Liang Qi --- mkspecs/features/qt_configure.prf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf index e67d3b93b1..7a1e588994 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -411,7 +411,7 @@ defineTest(qtConfTest_compile) { # add possible command line args qmake_configs += $$qtConfPrepareArgs($$eval($${1}.args)) - qtRunLoggedCommand("$$test_cmd_base $$system_quote($$system_path($$QMAKE_QMAKE)) $$qtconfarg $$qmake_configs $$shell_quote($$test_dir)") { + qtRunLoggedCommand("$$test_cmd_base $$qtConfPkgConfigEnv()$$system_quote($$system_path($$QMAKE_QMAKE)) $$qtconfarg $$qmake_configs $$shell_quote($$test_dir)") { qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE"): \ return(true) } -- cgit v1.2.3