diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-02-09 16:56:03 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-02-22 07:46:39 +0000 |
| commit | 0f16ac3d642e44e594f4d0fec5d271dbbfc8fe1a (patch) | |
| tree | e9d1f9e191f30fda50c868c45da1d3105561b2bf /mkspecs | |
| parent | 632b1c1345c2ebed6300a3d1d7d2056922a7e1a0 (diff) | |
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 <lars.knoll@qt.io>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt_configure.prf | 6 |
1 files changed, 5 insertions, 1 deletions
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) { |