From 98526119c6940e9923655242c181283081efb694 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Wed, 22 Jun 2016 09:52:41 +0200 Subject: Handle the -[no]make command line arguments in qmake Change-Id: I979f648b4301152e4a13ffe90aa05d9ded8556c8 Reviewed-by: Oswald Buddenhagen --- configure.pri | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) (limited to 'configure.pri') diff --git a/configure.pri b/configure.pri index 073a109ac0..1ff9003429 100644 --- a/configure.pri +++ b/configure.pri @@ -207,6 +207,28 @@ defineTest(qtConfTest_skipModules) { return(true) } +defineTest(qtConfTest_buildParts) { + parts = $$config.input.make + isEmpty(parts) { + parts = libs examples + + $$qtConfEvaluate("features.developer-build"): \ + parts += tests + !$$qtConfEvaluate("features.cross_compile"): \ + parts += tools + } + + ios|tvos: parts -= examples + parts -= $$config.input.nomake + + # always add libs, as it's required to build Qt + parts *= libs + + $${1}.value = $$parts + export($${1}.value) + return(true) +} + defineTest(qtConfTest_openssl) { libs = $$getenv("OPENSSL_LIBS") @@ -652,7 +674,7 @@ defineTest(qtConfOutputPostProcess_publicHeader) { # custom reporting defineTest(qtConfReport_buildParts) { - qtConfReportPadded($${1}, $$config.input.qt_build_parts) + qtConfReportPadded($${1}, $$qtConfEvaluate("tests.build_parts.value")) } defineTest(qtConfReport_buildTypeAndConfig) { -- cgit v1.2.3