Merge branch '1.19' into master

Change-Id: Ic6087168a1d93c2a2b46de825f5c3b9655634e8e

8 files changed, 3 insertions, 47 deletions

diff --git a/tests/auto/blackbox/testdata-baremetal/generate-compiler-listing/generate-compiler-listing.qbs b/tests/auto/blackbox/testdata-baremetal/compiler-listing/compiler-listing.qbs
index a6731d224..bcf983c88 100644
--- a/tests/auto/blackbox/testdata-baremetal/generate-compiler-listing/generate-compiler-listing.qbs
+++ b/tests/auto/blackbox/testdata-baremetal/compiler-listing/compiler-listing.qbs
@@ -3,14 +3,12 @@ import "../BareMetalApplication.qbs" as BareMetalApplication
 BareMetalApplication {
     condition: {
         if (!qbs.toolchain.contains("gcc")) {
-            if (cpp.compilerName.startsWith("armcc"))
-                console.info("using short listing file names");
+            console.info("compiler listing suffix: %%" + cpp.compilerListingSuffix + "%%");
             return true;
         }
         console.info("unsupported toolset: %%"
             + qbs.toolchainType + "%%, %%" + qbs.architecture + "%%");
         return false;
     }
-    cpp.generateCompilerListingFiles: true
     files: ["main.c", "fun.c"]
 }
diff --git a/tests/auto/blackbox/testdata-baremetal/do-not-generate-compiler-listing/fun.c b/tests/auto/blackbox/testdata-baremetal/compiler-listing/fun.c
index 3b8c8f2f4..3b8c8f2f4 100644
--- a/tests/auto/blackbox/testdata-baremetal/do-not-generate-compiler-listing/fun.c
+++ b/tests/auto/blackbox/testdata-baremetal/compiler-listing/fun.c
diff --git a/tests/auto/blackbox/testdata-baremetal/do-not-generate-compiler-listing/main.c b/tests/auto/blackbox/testdata-baremetal/compiler-listing/main.c
index 2c3d7726c..2c3d7726c 100644
--- a/tests/auto/blackbox/testdata-baremetal/do-not-generate-compiler-listing/main.c
+++ b/tests/auto/blackbox/testdata-baremetal/compiler-listing/main.c
diff --git a/tests/auto/blackbox/testdata-baremetal/do-not-generate-compiler-listing/do-not-generate-compiler-listing.qbs b/tests/auto/blackbox/testdata-baremetal/do-not-generate-compiler-listing/do-not-generate-compiler-listing.qbs
deleted file mode 100644
index 1bc4ba208..000000000
--- a/tests/auto/blackbox/testdata-baremetal/do-not-generate-compiler-listing/do-not-generate-compiler-listing.qbs
+++ /dev/null
@@ -1,16 +0,0 @@
-import "../BareMetalApplication.qbs" as BareMetalApplication
-
-BareMetalApplication {
-    condition: {
-        if (!qbs.toolchain.contains("gcc")) {
-            if (cpp.compilerName.startsWith("armcc"))
-                console.info("using short listing file names");
-            return true;
-        }
-        console.info("unsupported toolset: %%"
-            + qbs.toolchainType + "%%, %%" + qbs.architecture + "%%");
-        return false;
-    }
-    cpp.generateCompilerListingFiles: false
-    files: ["main.c", "fun.c"]
-}
diff --git a/tests/auto/blackbox/testdata-baremetal/external-static-libraries/external-static-libraries.qbs b/tests/auto/blackbox/testdata-baremetal/external-static-libraries/external-static-libraries.qbs
index 6fbbb8647..fffb6a03d 100644
--- a/tests/auto/blackbox/testdata-baremetal/external-static-libraries/external-static-libraries.qbs
+++ b/tests/auto/blackbox/testdata-baremetal/external-static-libraries/external-static-libraries.qbs
@@ -2,20 +2,6 @@ import "../BareMetalApplication.qbs" as BareMetalApplication
 import "../BareMetalStaticLibrary.qbs" as BareMetalStaticLibrary
 
 Project {
-    condition: {
-        // The KEIL C51/C251/C166 toolchains support only a
-        // full paths to the external libraries.
-        if (qbs.toolchainType === "keil") {
-            if (qbs.architecture === "mcs51"
-                || qbs.architecture === "mcs251"
-                || qbs.architecture === "c166") {
-                console.info("unsupported toolset: %%"
-                    + qbs.toolchainType + "%%, %%" + qbs.architecture + "%%");
-                return false;
-            }
-        }
-        return true;
-    }
     property string outputLibrariesDirectory: sourceDirectory + "/libs"
     BareMetalStaticLibrary {
         name: "lib-a"
diff --git a/tests/auto/blackbox/testdata-baremetal/generate-compiler-listing/fun.c b/tests/auto/blackbox/testdata-baremetal/generate-compiler-listing/fun.c
deleted file mode 100644
index 3b8c8f2f4..000000000
--- a/tests/auto/blackbox/testdata-baremetal/generate-compiler-listing/fun.c
+++ /dev/null
@@ -1,4 +0,0 @@
-int f(void)
-{
-    return 0;
-}
diff --git a/tests/auto/blackbox/testdata-baremetal/generate-compiler-listing/main.c b/tests/auto/blackbox/testdata-baremetal/generate-compiler-listing/main.c
deleted file mode 100644
index 2c3d7726c..000000000
--- a/tests/auto/blackbox/testdata-baremetal/generate-compiler-listing/main.c
+++ /dev/null
@@ -1,6 +0,0 @@
-extern int f(void);
-
-int main(void)
-{
-    return f();
-}
diff --git a/tests/auto/blackbox/testdata-baremetal/linker-map/linker-map.qbs b/tests/auto/blackbox/testdata-baremetal/linker-map/linker-map.qbs
index 676221e11..fe93ac144 100644
--- a/tests/auto/blackbox/testdata-baremetal/linker-map/linker-map.qbs
+++ b/tests/auto/blackbox/testdata-baremetal/linker-map/linker-map.qbs
@@ -1,10 +1,8 @@
 import "../BareMetalApplication.qbs" as BareMetalApplication
 
 BareMetalApplication {
-    condition: {
-        console.info("current toolset: %%"
-            + qbs.toolchainType + "%%, %%" + qbs.architecture + "%%");
-        return true;
+    property bool dummy: {
+        console.info("linker map suffix: %%" + cpp.linkerMapSuffix + "%%");
     }
     files: ["main.c"]
 }