Merge branch '1.17' into master

Change-Id: I20a6b02ee34719636f9996e02cff9e29cf160dd7

3 files changed, 13 insertions, 9 deletions

diff --git a/share/qbs/modules/cpp/CppModule.qbs b/share/qbs/modules/cpp/CppModule.qbs
index 173c3f3e5..b2897c30c 100644
--- a/share/qbs/modules/cpp/CppModule.qbs
+++ b/share/qbs/modules/cpp/CppModule.qbs
@@ -128,7 +128,7 @@ Module {
                         defaults will be used."
     }
 
-    property string minimumAndroidVersion
+    property string minimumAndroidVersion // not used, undocumented
     PropertyOptions {
         name: "minimumAndroidVersion"
         description: "a version number in the format [major].[minor] indicating the earliest \
@@ -136,7 +136,7 @@ Module {
                         version which is then written to AndroidManifest.xml."
     }
 
-    property string maximumAndroidVersion
+    property string maximumAndroidVersion // not used, undocumented
     PropertyOptions {
         name: "maximumAndroidVersion"
         description: "a version number in the format [major].[minor] indicating the latest \
@@ -384,13 +384,14 @@ Module {
     property bool combineObjcSources: false
     property bool combineObjcxxSources: false
 
+    // Those are set internally by different cpp module implementations
     property stringList targetAssemblerFlags
     property stringList targetDriverFlags
     property stringList targetLinkerFlags
 
     property bool _skipAllChecks: false // Internal
 
-    property bool validateTargetTriple: true
+    property bool validateTargetTriple: true // undocumented
 
     // TODO: The following four rules could use a convenience base item if rule properties
     //       were available in Artifact items and prepare scripts.
diff --git a/share/qbs/modules/cpp/iar.js b/share/qbs/modules/cpp/iar.js
index ffc0773e0..c1dea56ab 100644
--- a/share/qbs/modules/cpp/iar.js
+++ b/share/qbs/modules/cpp/iar.js
@@ -305,7 +305,7 @@ function guessArchitecture(macros) {
         return "r32c";
     else if (macros["__ICCM16C__"] === "1")
         return "m16c";
-    else if (macros["__ICCRC16C__"] === "1")
+    else if (macros["__ICCCR16C__"] === "1")
         return "cr16";
 }
 
@@ -598,10 +598,13 @@ function compilerFlags(project, product, input, outputs, explicitlyDependsOn) {
         break;
     case "all":
         if (architecture !== "78k") {
-            args.push("--deprecated_feature_warnings="
-                +"+attribute_syntax,"
-                +"+preprocessor_extensions,"
-                +"+segment_pragmas");
+            if (architecture !== "avr32" && architecture !== "r32c"
+                && architecture !== "sh" && architecture !== "m16c") {
+                args.push("--deprecated_feature_warnings="
+                    +"+attribute_syntax,"
+                    +"+preprocessor_extensions,"
+                    +"+segment_pragmas");
+            }
             if (tag === "cpp")
                 args.push("--warn_about_c_style_casts");
         }
diff --git a/share/qbs/modules/cpp/sdcc.js b/share/qbs/modules/cpp/sdcc.js
index 2b544d27c..49d74cb63 100644
--- a/share/qbs/modules/cpp/sdcc.js
+++ b/share/qbs/modules/cpp/sdcc.js
@@ -555,7 +555,7 @@ function prepareCompiler(project, product, inputs, outputs, input, output, expli
     // * https://sourceforge.net/p/sdcc/bugs/2970/
     // We need to replace the '\r\n\' line endings with the'\n' line
     // endings for each generated object file.
-    var isWindows = input.qbs.targetOS.contains("windows");
+    var isWindows = input.qbs.hostOS.contains("windows");
     if (isWindows) {
         cmd = new JavaScriptCommand();
         cmd.objectPath = outputs.obj[0].filePath;