diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-04-26 09:55:10 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-04-26 09:55:10 +0200 |
| commit | 866b47916dfcf2823b8fc4df719f1ebf15acef70 (patch) | |
| tree | a4eef09d00d407dec26b99b9f094bf1f5093dcb8 /configure.json | |
| parent | a9fc91466c2c143bea422d98af24755f43c2b97b (diff) | |
| parent | 4bab1b0d7c2462ee9c5369c949b45bc4dedc1194 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/plugins/platforms/cocoa/qcocoafontdialoghelper.mm
src/plugins/platforms/cocoa/qcocoawindow.mm
Change-Id: Ideea96d1b43d47b1d9b34e11c9986a88e240aa71
Diffstat (limited to 'configure.json')
| -rw-r--r-- | configure.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.json b/configure.json index 323b25e1d6..595bb619ce 100644 --- a/configure.json +++ b/configure.json @@ -552,11 +552,11 @@ "output": [ "prepareSpec", "prepareOptions", "preparePaths", "reloadSpec" ] }, "machineTuple": { - "condition": "!config.linux || config.android || tests.machineTuple", + "condition": "config.linux && !config.android && tests.machineTuple", "output": [ "machineTuple" ] }, "commit": { - "condition": "features.machineTuple", + "condition": "features.machineTuple || true", "output": [ "commitOptions" ] }, "android-style-assets": { |