summaryrefslogtreecommitdiffstats
path: root/configure.pri
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2016-06-22 09:52:41 +0200
committerLars Knoll <lars.knoll@qt.io>2016-07-02 06:18:55 +0000
commit98526119c6940e9923655242c181283081efb694 (patch)
tree0ce16bd9d0c8243194de6ef9a5b8ed53d65700d3 /configure.pri
parente9ba9609f1c3797baf8a54ba7213b56dcbe7e1ec (diff)
Handle the -[no]make command line arguments in qmake
Change-Id: I979f648b4301152e4a13ffe90aa05d9ded8556c8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'configure.pri')
-rw-r--r--configure.pri24
1 files changed, 23 insertions, 1 deletions
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) {