diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2017-10-02 11:02:22 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2017-10-02 11:02:37 +0200 |
| commit | 44cf2e744cf8a36ba7bcfe9766b616e6b9e4aee8 (patch) | |
| tree | 933b39cc75ab4c12a1a17b1255166b35d3e285f3 /share | |
| parent | b6eeaf55e913b7e392371ba6ca020aafa4123719 (diff) | |
| parent | 83f43f57ac79fa673fda08805e29763a8303d5ea (diff) | |
Merge 1.9 into master
Change-Id: Ib391e8d1fc1b14849fe6b962d2e4b466dc46aa79
Diffstat (limited to 'share')
| -rw-r--r-- | share/qbs/imports/qbs/ModUtils/utils.js | 5 | ||||
| -rw-r--r-- | share/qbs/modules/qbs/common.qbs | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/share/qbs/imports/qbs/ModUtils/utils.js b/share/qbs/imports/qbs/ModUtils/utils.js index 9de6a92c6..79bcd9935 100644 --- a/share/qbs/imports/qbs/ModUtils/utils.js +++ b/share/qbs/imports/qbs/ModUtils/utils.js @@ -561,6 +561,11 @@ function guessArchitecture(m) { architecture = "sparc"; if (hasAnyOf(m, ["__sparc64__"])) architecture += "64"; + } else if (hasAnyOf(m, ["__AVR__"])) { + architecture = "avr"; + var avrSuffix = m["__AVR_ARCH__"]; + if (avrSuffix) + architecture += avrSuffix; } } diff --git a/share/qbs/modules/qbs/common.qbs b/share/qbs/modules/qbs/common.qbs index 3f65c8d09..262a44317 100644 --- a/share/qbs/modules/qbs/common.qbs +++ b/share/qbs/modules/qbs/common.qbs @@ -233,7 +233,7 @@ Module { return architecture ? [architecture] : undefined; } - property stringList buildVariants: [defaultBuildVariant] + property stringList buildVariants: [buildVariant] // internal properties readonly property string version: [versionMajor, versionMinor, versionPatch].join(".") |