Merge branch '1.19' into master

Change-Id: Ic6087168a1d93c2a2b46de825f5c3b9655634e8e

1 files changed, 0 insertions, 14 deletions

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"