From 0f16ac3d642e44e594f4d0fec5d271dbbfc8fe1a Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 9 Feb 2017 16:56:03 +0100 Subject: [PATCH] configure: propagate errors from libraries' transitive dependencies if a library uses another library which happens to be absent, then the former must also fail. amends cc842ca4. Change-Id: I91f157a6d1ed40b66e196340a282ebe493fcf40e Reviewed-by: Lars Knoll --- mkspecs/features/qt_configure.prf | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf index 7744695b93..e157904145 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -673,7 +673,11 @@ defineTest(qtConfHandleLibrary) { } qtConfEnsureTestTypeDeps("library") - qtConfTestPrepare_compile($$lpfx) + !qtConfTestPrepare_compile($$lpfx) { + $${lpfx}.result = false + export($${lpfx}.result) + return() + } use_args = $$eval($${lpfx}.literal_args) qtConfLoadResult($${lpfx}, $$1) {