summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@qt.io>2016-12-20 17:59:07 +0100
committerOswald Buddenhagen <oswald.buddenhagen@qt.io>2016-12-22 11:48:13 +0000
commit63e7ff97e960987080e6bda668ba960650dca87f (patch)
tree59a649749c6c5391cb4291c0f6b80b1447e50584
parent4cbec6b7303302a2b3026d5602262e2e9469a0a6 (diff)
configure: properly serialize machine tuple detection
detecting the machine tuple must happen before committing qdevice.pri. Change-Id: Ic37eda42fff805d6e1edb5dd92898abd59d6bdc9 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
-rw-r--r--configure.json1
1 files changed, 1 insertions, 0 deletions
diff --git a/configure.json b/configure.json
index 2c27891729..1886f4074e 100644
--- a/configure.json
+++ b/configure.json
@@ -430,6 +430,7 @@
"output": [ "machineTuple" ]
},
"commit": {
+ "condition": "features.machineTuple",
"output": [ "commitOptions" ]
},
"android-style-assets": {