Prefer built-in JS function in autotests

contains -> includes Change-Id: I330b1ee3319399d6c59ce5a4efaf14c642ad361e Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
author: Christian Kandeler <christian.kandeler@qt.io> 2023-02-15 12:55:02 +0100
committer: Christian Kandeler <christian.kandeler@qt.io> 2023-02-16 13:04:04 +0000
commit: 69c3daf42c0ffb9b1f479d37f0caced77dc7fde8 (patch)
tree: 39d2abe570b9087f6b6d5d0e18a6d4710a233b34
parent: d60e43c90e9dd0565128e7b3e315ff82115418f7 (diff)
131 files changed, 282 insertions, 282 deletions
diff --git a/tests/auto/api/testdata/QBS-728/QBS-728.qbs b/tests/auto/api/testdata/QBS-728/QBS-728.qbs
index 5969e13cc..cdeb7c6db 100644
--- a/tests/auto/api/testdata/QBS-728/QBS-728.qbs
+++ b/tests/auto/api/testdata/QBS-728/QBS-728.qbs
@@ -1,5 +1,5 @@
 Product {
-    property bool isBlubbOS: qbs.targetOS.contains("blubb-OS")
+    property bool isBlubbOS: qbs.targetOS.includes("blubb-OS")
     qbs.profiles: isBlubbOS ? ["blubb-profile"] : [project.profile]
     qbs.architecture: "blubb-arch"
 }
diff --git a/tests/auto/api/testdata/app-without-sources/app-without-sources.qbs b/tests/auto/api/testdata/app-without-sources/app-without-sources.qbs
index 4cc25ad66..db707f515 100644
--- a/tests/auto/api/testdata/app-without-sources/app-without-sources.qbs
+++ b/tests/auto/api/testdata/app-without-sources/app-without-sources.qbs
@@ -26,7 +26,7 @@ Project {
 
         // HACK: cpp.entryPoint currently not working 100% with gcc
         Properties {
-            condition: qbs.toolchain.contains("msvc")
+            condition: qbs.toolchain.includes("msvc")
             cpp.entryPoint: "main"
             cpp.dynamicLibraries: ["ucrt", "kernel32"]
         }
diff --git a/tests/auto/api/testdata/change-dependent-lib/change-dependent-lib.qbs b/tests/auto/api/testdata/change-dependent-lib/change-dependent-lib.qbs
index 222dc4476..cb925eeca 100644
--- a/tests/auto/api/testdata/change-dependent-lib/change-dependent-lib.qbs
+++ b/tests/auto/api/testdata/change-dependent-lib/change-dependent-lib.qbs
@@ -18,7 +18,7 @@ Project {
         cpp.defines: ["XXXX"]
 
         Properties {
-            condition: qbs.targetOS.contains("darwin")
+            condition: qbs.targetOS.includes("darwin")
             bundle.isBundle: false
         }
     }
diff --git a/tests/auto/api/testdata/codegen/codegen.qbs b/tests/auto/api/testdata/codegen/codegen.qbs
index 29c7818c4..42e4c6b08 100644
--- a/tests/auto/api/testdata/codegen/codegen.qbs
+++ b/tests/auto/api/testdata/codegen/codegen.qbs
@@ -43,7 +43,7 @@ Project {
 
             // check whether multipart module name translation is working
             var actual = product.moduleProperty("Qt.core", "mocName");
-            if (!actual || !actual.contains("moc"))
+            if (!actual || !actual.includes("moc"))
                 throw "multipart module name translation is broken";
 
             // check whether we can access project properties here
@@ -57,7 +57,7 @@ Project {
             code = expandMacros(code, product.replacements);
             var args = ['echo ' + code + '>' + output.filePath]
             var cmd
-            if (product.moduleProperty("qbs", "hostOS").contains('windows')) {
+            if (product.moduleProperty("qbs", "hostOS").includes('windows')) {
                 cmd = new Command(product.qbs.windowsShellPath, ['/C'].concat(args));
             } else {
                 args[0] = args[0].replace(/\(/g, '\\(')
diff --git a/tests/auto/api/testdata/disabled-product/disabled-product.qbs b/tests/auto/api/testdata/disabled-product/disabled-product.qbs
index dad8f5d4c..e7eea7380 100644
--- a/tests/auto/api/testdata/disabled-product/disabled-product.qbs
+++ b/tests/auto/api/testdata/disabled-product/disabled-product.qbs
@@ -2,7 +2,7 @@ CppApplication {
     condition: false
     files: "main.cpp"
     Group {
-        condition: qbs.targetOS.contains("stuff")
+        condition: qbs.targetOS.includes("stuff")
         qbs.install: false
     }
 }
diff --git a/tests/auto/api/testdata/export-simple/export-simple.qbs b/tests/auto/api/testdata/export-simple/export-simple.qbs
index 01177049d..84ce5541d 100644
--- a/tests/auto/api/testdata/export-simple/export-simple.qbs
+++ b/tests/auto/api/testdata/export-simple/export-simple.qbs
@@ -43,7 +43,7 @@ Project {
         }
         Depends { name: "cpp" }
         Properties {
-            condition: qbs.targetOS.contains("darwin")
+            condition: qbs.targetOS.includes("darwin")
             bundle.isBundle: false
         }
     }
diff --git a/tests/auto/api/testdata/infinite-loop-process/infinite-loop.qbs b/tests/auto/api/testdata/infinite-loop-process/infinite-loop.qbs
index 99aafea1c..687955f2f 100644
--- a/tests/auto/api/testdata/infinite-loop-process/infinite-loop.qbs
+++ b/tests/auto/api/testdata/infinite-loop-process/infinite-loop.qbs
@@ -8,7 +8,7 @@ Project {
         name: "infinite-loop"
         cpp.cxxLanguageVersion: "c++11"
         Properties {
-            condition: qbs.toolchain.contains("gcc")
+            condition: qbs.toolchain.includes("gcc")
             cpp.driverFlags: "-pthread"
         }
     }
@@ -19,7 +19,7 @@ Project {
         Depends { name: "infinite-loop" }
         Depends {
             name: "cpp" // Make sure build environment is set up properly.
-            condition: Host.os().contains("windows") && qbs.toolchain.contains("gcc")
+            condition: Host.os().includes("windows") && qbs.toolchain.includes("gcc")
         }
         Rule {
             inputsFromDependencies: "application"
diff --git a/tests/auto/api/testdata/is-runnable/is-runnable.qbs b/tests/auto/api/testdata/is-runnable/is-runnable.qbs
index 870279294..e93cc38aa 100644
--- a/tests/auto/api/testdata/is-runnable/is-runnable.qbs
+++ b/tests/auto/api/testdata/is-runnable/is-runnable.qbs
@@ -5,7 +5,7 @@ Project {
     DynamicLibrary {
         name: "lib"
         Properties {
-            condition: qbs.targetOS.contains("darwin")
+            condition: qbs.targetOS.includes("darwin")
             bundle.isBundle: false
         }
     }
diff --git a/tests/auto/api/testdata/link-dynamiclibs-staticlibs/link-dynamiclibs-staticlibs.qbs b/tests/auto/api/testdata/link-dynamiclibs-staticlibs/link-dynamiclibs-staticlibs.qbs
index b2a54080c..4ba829a5b 100644
--- a/tests/auto/api/testdata/link-dynamiclibs-staticlibs/link-dynamiclibs-staticlibs.qbs
+++ b/tests/auto/api/testdata/link-dynamiclibs-staticlibs/link-dynamiclibs-staticlibs.qbs
@@ -12,7 +12,7 @@ Project {
         Depends { name: "cpp" }
         Depends { name: "static1" }
         Properties {
-            condition: qbs.targetOS.contains("darwin")
+            condition: qbs.targetOS.includes("darwin")
             bundle.isBundle: false
         }
     }
@@ -31,7 +31,7 @@ Project {
         Depends { name: "static2" }
         cpp.visibility: 'hidden'
         Properties {
-            condition: qbs.targetOS.contains("darwin")
+            condition: qbs.targetOS.includes("darwin")
             bundle.isBundle: false
         }
     }
diff --git a/tests/auto/api/testdata/link-dynamiclibs/link-dynamiclibs.qbs b/tests/auto/api/testdata/link-dynamiclibs/link-dynamiclibs.qbs
index 2efe8d4e8..e0bce7264 100644
--- a/tests/auto/api/testdata/link-dynamiclibs/link-dynamiclibs.qbs
+++ b/tests/auto/api/testdata/link-dynamiclibs/link-dynamiclibs.qbs
@@ -17,7 +17,7 @@ Project {
         Depends { name: "cpp" }
         Depends { name: "lib2" }
         Properties {
-            condition: qbs.targetOS.contains("darwin")
+            condition: qbs.targetOS.includes("darwin")
             bundle.isBundle: false
         }
     }
@@ -31,7 +31,7 @@ Project {
         Depends { name: "cpp" }
         Depends { name: "lib3" }
         Properties {
-            condition: qbs.targetOS.contains("darwin")
+            condition: qbs.targetOS.includes("darwin")
             bundle.isBundle: false
         }
     }
@@ -44,7 +44,7 @@ Project {
         }
         Depends { name: "cpp" }
         Properties {
-            condition: qbs.targetOS.contains("darwin")
+            condition: qbs.targetOS.includes("darwin")
             bundle.isBundle: false
         }
     }
@@ -58,7 +58,7 @@ Project {
         }
         Depends { name: "cpp" }
         Properties {
-            condition: qbs.targetOS.contains("darwin")
+            condition: qbs.targetOS.includes("darwin")
             bundle.isBundle: false
         }
 
diff --git a/tests/auto/api/testdata/link-staticlibs-dynamiclibs/link-staticlibs-dynamiclibs.qbs b/tests/auto/api/testdata/link-staticlibs-dynamiclibs/link-staticlibs-dynamiclibs.qbs
index d7ed6c862..1bcc2876f 100644
--- a/tests/auto/api/testdata/link-staticlibs-dynamiclibs/link-staticlibs-dynamiclibs.qbs
+++ b/tests/auto/api/testdata/link-staticlibs-dynamiclibs/link-staticlibs-dynamiclibs.qbs
@@ -14,8 +14,8 @@ Project {
 
         Probe {
             id: osCheck
-            property bool isNormalUnix: qbs.targetOS.contains("unix")
-                                        && !qbs.targetOS.contains("darwin")
+            property bool isNormalUnix: qbs.targetOS.includes("unix")
+                                        && !qbs.targetOS.includes("darwin")
             configure: { console.info("is normal unix: " + (isNormalUnix ? "yes" : "no")); }
         }
     }
@@ -26,7 +26,7 @@ Project {
         Depends { name: "cpp" }
         Depends { name: "static2" }
         Properties {
-            condition: qbs.targetOS.contains("darwin")
+            condition: qbs.targetOS.includes("darwin")
             bundle.isBundle: false
         }
     }
@@ -44,7 +44,7 @@ Project {
         Depends { name: "cpp" }
         cpp.visibility: 'hidden'
         Properties {
-            condition: qbs.targetOS.contains("darwin")
+            condition: qbs.targetOS.includes("darwin")
             bundle.isBundle: false
         }
     }
diff --git a/tests/auto/api/testdata/moc-hpp-included/moc-hpp-included.qbs b/tests/auto/api/testdata/moc-hpp-included/moc-hpp-included.qbs
index a484b9c22..38d3d88ca 100644
--- a/tests/auto/api/testdata/moc-hpp-included/moc-hpp-included.qbs
+++ b/tests/auto/api/testdata/moc-hpp-included/moc-hpp-included.qbs
@@ -11,7 +11,7 @@ Project {
         files: ["object.cpp", "object.h"]
 
         Group {
-            condition: qbs.targetOS.contains("darwin")
+            condition: qbs.targetOS.includes("darwin")
             files: ["object2.mm", "object2.h"]
         }
     }
diff --git a/tests/auto/api/testdata/new-output-artifact-in-dependency/new-output-artifact-in-dependency.qbs b/tests/auto/api/testdata/new-output-artifact-in-dependency/new-output-artifact-in-dependency.qbs
index 5c3e475b0..e87af67c7 100644
--- a/tests/auto/api/testdata/new-output-artifact-in-dependency/new-output-artifact-in-dependency.qbs
+++ b/tests/auto/api/testdata/new-output-artifact-in-dependency/new-output-artifact-in-dependency.qbs
@@ -4,7 +4,7 @@ Project {
         name: "lib"
         files: "lib.cpp"
         Properties {
-            condition: qbs.targetOS.contains("darwin")
+            condition: qbs.targetOS.includes("darwin")
             bundle.isBundle: false
         }
     }
diff --git a/tests/auto/api/testdata/objc/objc.qbs b/tests/auto/api/testdata/objc/objc.qbs
index 845eb8d32..2fba48d9b 100644
--- a/tests/auto/api/testdata/objc/objc.qbs
+++ b/tests/auto/api/testdata/objc/objc.qbs
@@ -1,6 +1,6 @@
 Project {
     CppApplication {
-        condition: qbs.targetOS.contains("macos")
+        condition: qbs.targetOS.includes("macos")
         files: "main.mm"
         cpp.frameworks: [ "Foundation" ]
     }
diff --git a/tests/auto/api/testdata/project-with-properties-item/project-with-properties-item.qbs b/tests/auto/api/testdata/project-with-properties-item/project-with-properties-item.qbs
index 866ec4ecb..812c6a65e 100644
--- a/tests/auto/api/testdata/project-with-properties-item/project-with-properties-item.qbs
+++ b/tests/auto/api/testdata/project-with-properties-item/project-with-properties-item.qbs
@@ -3,7 +3,7 @@ Project {
     property string libPath: "/usr/lib"
 
     Properties {
-        condition: qbs.targetOS.contains("macos")
+        condition: qbs.targetOS.includes("macos")
         binPath: "/Users/boo"
         libPath: "/Libraries/foo"
     }
diff --git a/tests/auto/api/testdata/properties-blocks/properties-blocks.qbs b/tests/auto/api/testdata/properties-blocks/properties-blocks.qbs
index dda4652d2..c234a6b41 100644
--- a/tests/auto/api/testdata/properties-blocks/properties-blocks.qbs
+++ b/tests/auto/api/testdata/properties-blocks/properties-blocks.qbs
@@ -14,7 +14,7 @@ Product {
     }
 
     Properties {
-        condition: qbs.targetOS.contains("weird")
+        condition: qbs.targetOS.includes("weird")
         cpp.staticLibraries: "abc"
     }
 
diff --git a/tests/auto/api/testdata/qt5-plugin/qt5-plugin.qbs b/tests/auto/api/testdata/qt5-plugin/qt5-plugin.qbs
index d50072ad8..1558e3bc9 100644
--- a/tests/auto/api/testdata/qt5-plugin/qt5-plugin.qbs
+++ b/tests/auto/api/testdata/qt5-plugin/qt5-plugin.qbs
@@ -7,7 +7,7 @@ DynamicLibrary {
     Depends { name: "Qt.core" }
     Depends { name: "cpp" }
     Properties {
-        condition: qbs.targetOS.contains("darwin")
+        condition: qbs.targetOS.includes("darwin")
         bundle.isBundle: false
     }
 
diff --git a/tests/auto/api/testdata/rename-product/rename.qbs b/tests/auto/api/testdata/rename-product/rename.qbs
index 9d23bf804..aa59d9650 100644
--- a/tests/auto/api/testdata/rename-product/rename.qbs
+++ b/tests/auto/api/testdata/rename-product/rename.qbs
@@ -11,7 +11,7 @@ Project {
         cpp.defines: "MY_EXPORT=DLL_EXPORT"
         files: "lib.cpp"
         Properties {
-            condition: qbs.targetOS.contains("darwin")
+            condition: qbs.targetOS.includes("darwin")
             bundle.isBundle: false
         }
     }
diff --git a/tests/auto/api/testdata/rename-target-artifact/rename.qbs b/tests/auto/api/testdata/rename-target-artifact/rename.qbs
index 810b0eb08..aea4b8d9e 100644
--- a/tests/auto/api/testdata/rename-target-artifact/rename.qbs
+++ b/tests/auto/api/testdata/rename-target-artifact/rename.qbs
@@ -14,7 +14,7 @@ Project {
         qbs.buildVariant: "release"
         files: "lib.cpp"
         Properties {
-            condition: qbs.targetOS.contains("darwin")
+            condition: qbs.targetOS.includes("darwin")
             bundle.isBundle: false
         }
     }
diff --git a/tests/auto/api/testdata/same-base-name/same-base-name.qbs b/tests/auto/api/testdata/same-base-name/same-base-name.qbs
index 8448d04fd..ba0adfaac 100644
--- a/tests/auto/api/testdata/same-base-name/same-base-name.qbs
+++ b/tests/auto/api/testdata/same-base-name/same-base-name.qbs
@@ -16,7 +16,7 @@ Project {
         ]
 
         Group {
-            condition: qbs.targetOS.contains("darwin")
+            condition: qbs.targetOS.includes("darwin")
             files: [
                 "lib.m",
                 "lib.mm"
@@ -25,7 +25,7 @@ Project {
 
         Export {
             Depends { name: "cpp" }
-            cpp.frameworks: qbs.targetOS.contains("darwin") ? "Foundation" : undefined
+            cpp.frameworks: qbs.targetOS.includes("darwin") ? "Foundation" : undefined
         }
     }
 }
diff --git a/tests/auto/api/testdata/static-lib-deps/static-lib-deps.qbs b/tests/auto/api/testdata/static-lib-deps/static-lib-deps.qbs
index b584b4d41..67800b8eb 100644
--- a/tests/auto/api/testdata/static-lib-deps/static-lib-deps.qbs
+++ b/tests/auto/api/testdata/static-lib-deps/static-lib-deps.qbs
@@ -44,23 +44,23 @@ Project {
         ]
 
         Group {
-            condition: qbs.targetOS.contains("macos")
+            condition: qbs.targetOS.includes("macos")
             files: ["d.mm"]
         }
 
         Properties {
-            condition: qbs.targetOS.contains("windows")
+            condition: qbs.targetOS.includes("windows")
             cpp.defines: ["WITH_SETUPAPI"]
             cpp.staticLibraries: ["setupapi"]
         }
         Properties {
-            condition: qbs.targetOS.contains("macos")
+            condition: qbs.targetOS.includes("macos")
             cpp.defines: ["WITH_LEX_YACC"]
             cpp.staticLibraries: ["l", "y"]
             cpp.frameworks: ["Foundation"]
         }
         Properties {
-            condition: qbs.targetOS.contains("linux")
+            condition: qbs.targetOS.includes("linux")
             cpp.defines: ["WITH_PTHREAD"]
             cpp.staticLibraries: ["pthread"]
         }
@@ -84,7 +84,7 @@ Project {
         Depends { name: "e" }
 
         Properties {
-            condition: qbs.targetOS.contains("linux")
+            condition: qbs.targetOS.includes("linux")
             cpp.driverFlags: ["-static"]
         }
 
diff --git a/tests/auto/api/testdata/timeout-process/timeout.qbs b/tests/auto/api/testdata/timeout-process/timeout.qbs
index c95b5ae67..403506eed 100644
--- a/tests/auto/api/testdata/timeout-process/timeout.qbs
+++ b/tests/auto/api/testdata/timeout-process/timeout.qbs
@@ -9,7 +9,7 @@ Project {
         cpp.cxxLanguageVersion: "c++11"
         cpp.minimumOsxVersion: "10.8" // For <chrono>
         Properties {
-            condition: qbs.toolchain.contains("gcc")
+            condition: qbs.toolchain.includes("gcc")
             cpp.driverFlags: "-pthread"
         }
     }
@@ -26,7 +26,7 @@ Project {
         Depends { name: "infinite-loop" }
         Depends {
             name: "cpp" // Make sure build environment is set up properly.
-            condition: Host.os().contains("windows") && qbs.toolchain.contains("gcc")
+            condition: Host.os().includes("windows") && qbs.toolchain.includes("gcc")
         }
         Rule {
             inputsFromDependencies: "application"
diff --git a/tests/auto/api/testdata/tool-in-module/use-outside-project/modules/thetool/thetool.qbs b/tests/auto/api/testdata/tool-in-module/use-outside-project/modules/thetool/thetool.qbs
index de9c4e935..e2b1ec6df 100644
--- a/tests/auto/api/testdata/tool-in-module/use-outside-project/modules/thetool/thetool.qbs
+++ b/tests/auto/api/testdata/tool-in-module/use-outside-project/modules/thetool/thetool.qbs
@@ -6,7 +6,7 @@ Module {
     Group {
         name: "thetool binary"
         files: FileInfo.cleanPath(FileInfo.joinPaths(path, "..", "..",
-                   "thetool" + (Host.os().contains("windows") ? ".exe" : "")));
+                   "thetool" + (Host.os().includes("windows") ? ".exe" : "")));
         fileTags: ["thetool.thetool"]
         filesAreTargets: true
     }
diff --git a/tests/auto/blackbox/testdata-android/minimal-native/minimal-native.qbs b/tests/auto/blackbox/testdata-android/minimal-native/minimal-native.qbs
index 570152707..7231f7e62 100644
--- a/tests/auto/blackbox/testdata-android/minimal-native/minimal-native.qbs
+++ b/tests/auto/blackbox/testdata-android/minimal-native/minimal-native.qbs
@@ -1,7 +1,7 @@
 CppApplication {
     name: "minimalnative"
     qbs.buildVariant: "release"
-    Properties { condition: qbs.toolchain.contains("clang"); Android.ndk.appStl: "c++_shared" }
+    Properties { condition: qbs.toolchain.includes("clang"); Android.ndk.appStl: "c++_shared" }
     Android.sdk.packageName: "my.minimalnative"
     Android.sdk.apkBaseName: name
     Android.ndk.appStl: "stlport_shared"
diff --git a/tests/auto/blackbox/testdata-android/multiple-apks-per-project/product1/product1.qbs b/tests/auto/blackbox/testdata-android/multiple-apks-per-project/product1/product1.qbs
index c4a78a30b..61accd6dd 100644
--- a/tests/auto/blackbox/testdata-android/multiple-apks-per-project/product1/product1.qbs
+++ b/tests/auto/blackbox/testdata-android/multiple-apks-per-project/product1/product1.qbs
@@ -5,7 +5,7 @@ Project {
         name: "p1lib1"
         files: ["src/main/jni/lib1.cpp"]
         qbs.targetPlatform: "android"
-        Properties { condition: qbs.toolchain.contains("clang"); Android.ndk.appStl: "c++_shared" }
+        Properties { condition: qbs.toolchain.includes("clang"); Android.ndk.appStl: "c++_shared" }
         Android.ndk.appStl: "stlport_shared"
         qbs.architectures: !qbs.architecture ? ["armv7a", "x86"] : undefined
         cpp.useRPaths: false
@@ -17,7 +17,7 @@ Project {
         name: "p1lib2"
         files: ["src/main/jni/lib2.cpp"]
         qbs.targetPlatform: "android"
-        Properties { condition: qbs.toolchain.contains("clang"); Android.ndk.appStl: "c++_shared" }
+        Properties { condition: qbs.toolchain.includes("clang"); Android.ndk.appStl: "c++_shared" }
         Android.ndk.appStl: "stlport_shared"
         cpp.useRPaths: false
     }
diff --git a/tests/auto/blackbox/testdata-android/multiple-apks-per-project/product2/product2.qbs b/tests/auto/blackbox/testdata-android/multiple-apks-per-project/product2/product2.qbs
index 9be70dcda..f880a576d 100644
--- a/tests/auto/blackbox/testdata-android/multiple-apks-per-project/product2/product2.qbs
+++ b/tests/auto/blackbox/testdata-android/multiple-apks-per-project/product2/product2.qbs
@@ -13,7 +13,7 @@ Project {
         name: "p2lib2"
         files: ["src/main/jni/lib2.cpp"]
         qbs.targetPlatform: "android"
-        Properties { condition: qbs.toolchain.contains("clang"); Android.ndk.appStl: "c++_shared" }
+        Properties { condition: qbs.toolchain.includes("clang"); Android.ndk.appStl: "c++_shared" }
         Android.ndk.appStl: "stlport_shared"
     }
 
diff --git a/tests/auto/blackbox/testdata-android/multiple-libs-per-apk/multiple-libs-per-apk.qbs b/tests/auto/blackbox/testdata-android/multiple-libs-per-apk/multiple-libs-per-apk.qbs
index 8b9ded211..a5e193905 100644
--- a/tests/auto/blackbox/testdata-android/multiple-libs-per-apk/multiple-libs-per-apk.qbs
+++ b/tests/auto/blackbox/testdata-android/multiple-libs-per-apk/multiple-libs-per-apk.qbs
@@ -5,7 +5,7 @@ Project {
         name: "lib1"
         files: ["src/main/jni/lib1.cpp"]
         qbs.targetPlatform: "android"
-        Properties { condition: qbs.toolchain.contains("clang"); Android.ndk.appStl: "c++_shared" }
+        Properties { condition: qbs.toolchain.includes("clang"); Android.ndk.appStl: "c++_shared" }
         Android.ndk.appStl: "stlport_shared"
         cpp.useRPaths: false
     }
@@ -16,7 +16,7 @@ Project {
         name: "lib2"
         files: ["src/main/jni/lib2.cpp"]
         qbs.targetPlatform: "android"
-        Properties { condition: qbs.toolchain.contains("clang"); Android.ndk.appStl: "c++_shared" }
+        Properties { condition: qbs.toolchain.includes("clang"); Android.ndk.appStl: "c++_shared" }
         Android.ndk.appStl: "stlport_shared"
         cpp.useRPaths: false
     }
diff --git a/tests/auto/blackbox/testdata-android/qml-app/qml-app.qbs b/tests/auto/blackbox/testdata-android/qml-app/qml-app.qbs
index 472f1b657..5760fa4f0 100644
--- a/tests/auto/blackbox/testdata-android/qml-app/qml-app.qbs
+++ b/tests/auto/blackbox/testdata-android/qml-app/qml-app.qbs
@@ -3,7 +3,7 @@ QtApplication {
     Depends { name: "Qt.quick" }
     Depends { name: "Qt.android_support" }
     Properties {
-        condition: qbs.targetOS.contains("android")
+        condition: qbs.targetOS.includes("android")
         Qt.android_support.extraPrefixDirs: path
     }
     Android.sdk.packageName: "my.qmlapp"
diff --git a/tests/auto/blackbox/testdata-android/teapot/teapot.qbs b/tests/auto/blackbox/testdata-android/teapot/teapot.qbs
index 30cfbb820..0b1dead6e 100644
--- a/tests/auto/blackbox/testdata-android/teapot/teapot.qbs
+++ b/tests/auto/blackbox/testdata-android/teapot/teapot.qbs
@@ -51,7 +51,7 @@ Project {
             files: ["*.cpp", "*.h"].concat(
                 !File.exists(ndkHelperProbe.dir + "/gl3stub.cpp") ? ["gl3stub.c"] : [])
         }
-        Properties { condition: qbs.toolchain.contains("clang"); Android.ndk.appStl: "c++_shared" }
+        Properties { condition: qbs.toolchain.includes("clang"); Android.ndk.appStl: "c++_shared" }
         Android.ndk.appStl: "gnustl_shared"
         cpp.cxxLanguageVersion: "c++11"
 
@@ -137,7 +137,7 @@ Project {
         Android.sdk.apkBaseName: name
         Android.sdk.packageName: "com.sample.teapot"
         Android.sdk.sourceSetDir: teapotProbe.dir
-        Properties { condition: qbs.toolchain.contains("clang"); Android.ndk.appStl: "c++_shared" }
+        Properties { condition: qbs.toolchain.includes("clang"); Android.ndk.appStl: "c++_shared" }
         Android.ndk.appStl: "gnustl_shared"
         cpp.cxxLanguageVersion: "c++11"
         cpp.dynamicLibraries: ["log", "android", "EGL", "GLESv2"]
diff --git a/tests/auto/blackbox/testdata-apple/apple-multiconfig/apple-multiconfig.qbs b/tests/auto/blackbox/testdata-apple/apple-multiconfig/apple-multiconfig.qbs
index 0a06125eb..5615722d5 100644
--- a/tests/auto/blackbox/testdata-apple/apple-multiconfig/apple-multiconfig.qbs
+++ b/tests/auto/blackbox/testdata-apple/apple-multiconfig/apple-multiconfig.qbs
@@ -56,7 +56,7 @@ Project {
         name: "singlelib"
         targetName: "singlelib"
         files: ["lib.c"]
-        cpp.sonamePrefix: qbs.targetOS.contains("darwin") ? "@rpath" : undefined
+        cpp.sonamePrefix: qbs.targetOS.includes("darwin") ? "@rpath" : undefined
         cpp.defines: ["VARIANT=" + Utilities.cStringQuote(qbs.buildVariant)]
 
         // Turn off multiplexing
@@ -128,7 +128,7 @@ Project {
         targetName: "multilib"
         files: ["lib.c"]
         cpp.minimumIosVersion: "8.0"
-        cpp.sonamePrefix: qbs.targetOS.contains("darwin") ? "@rpath" : undefined
+        cpp.sonamePrefix: qbs.targetOS.includes("darwin") ? "@rpath" : undefined
         cpp.defines: ["VARIANT=" + Utilities.cStringQuote(qbs.buildVariant)]
         qbs.architectures: Helpers.getArchitectures(qbs, project.xcodeVersion)
         qbs.buildVariants: ["release", "debug", "profiling"]
@@ -145,7 +145,7 @@ Project {
         targetName: "multilib-no-release"
         files: ["lib.c"]
         cpp.minimumIosVersion: "8.0"
-        cpp.sonamePrefix: qbs.targetOS.contains("darwin") ? "@rpath" : undefined
+        cpp.sonamePrefix: qbs.targetOS.includes("darwin") ? "@rpath" : undefined
         cpp.defines: ["VARIANT=" + Utilities.cStringQuote(qbs.buildVariant)]
         qbs.architectures: Helpers.getArchitectures(qbs, project.xcodeVersion)
         qbs.buildVariants: ["debug", "profiling"]
diff --git a/tests/auto/blackbox/testdata-apple/bundle-structure/bundle-structure.qbs b/tests/auto/blackbox/testdata-apple/bundle-structure/bundle-structure.qbs
index 705f054a8..33ac58967 100644
--- a/tests/auto/blackbox/testdata-apple/bundle-structure/bundle-structure.qbs
+++ b/tests/auto/blackbox/testdata-apple/bundle-structure/bundle-structure.qbs
@@ -17,7 +17,7 @@ Project {
         Depends { name: "B" }
         Depends { name: "C" }
         Depends { name: "D" }
-        condition: buildableProducts.contains("A")
+        condition: buildableProducts.includes("A")
         name: "A"
         bundle.isBundle: true
         bundle.publicHeaders: ["dummy.h"]
@@ -33,7 +33,7 @@ Project {
         Depends { name: "B" }
         Depends { name: "C" }
         Depends { name: "D" }
-        condition: buildableProducts.contains("ABadApple")
+        condition: buildableProducts.includes("ABadApple")
         name: "ABadApple"
         bundle._productTypeIdentifier: "com.apple.product-type.will.never.exist.ever.guaranteed"
         bundle.isBundle: true
@@ -50,7 +50,7 @@ Project {
         Depends { name: "B" }
         Depends { name: "C" }
         Depends { name: "D" }
-        condition: buildableProducts.contains("ABadThirdParty")
+        condition: buildableProducts.includes("ABadThirdParty")
         name: "ABadThirdParty"
         bundle._productTypeIdentifier: "org.special.third.party.non.existent.product.type"
         bundle.isBundle: true
@@ -103,7 +103,7 @@ Project {
 
     ApplicationExtension {
         Depends { name: "cpp" }
-        condition: buildableProducts.contains("E")
+        condition: buildableProducts.includes("E")
         name: "E"
         bundle.isBundle: true
         bundle.publicHeaders: ["dummy.h"]
@@ -116,7 +116,7 @@ Project {
 
     XPCService {
         Depends { name: "cpp" }
-        condition: buildableProducts.contains("F")
+        condition: buildableProducts.includes("F")
         name: "F"
         bundle.isBundle: true
         bundle.publicHeaders: ["dummy.h"]
@@ -129,7 +129,7 @@ Project {
 
     Product {
         Depends { name: "bundle" }
-        condition: buildableProducts.contains("G")
+        condition: buildableProducts.includes("G")
         type: ["inapppurchase"]
         name: "G"
         bundle.isBundle: true
diff --git a/tests/auto/blackbox/testdata-apple/deploymentTarget/deployment.qbs b/tests/auto/blackbox/testdata-apple/deploymentTarget/deployment.qbs
index 9eff57b60..2179e9c84 100644
--- a/tests/auto/blackbox/testdata-apple/deploymentTarget/deployment.qbs
+++ b/tests/auto/blackbox/testdata-apple/deploymentTarget/deployment.qbs
@@ -5,7 +5,7 @@ CppApplication {
     // - will actually link (as of Xcode 8.1)
     // - exist for the given architecture(s)
     cpp.minimumMacosVersion: qbs.architecture === "x86_64h" ? "10.12" : "10.6"
-    cpp.minimumIosVersion: ["armv7s", "arm64", "x86_64"].contains(qbs.architecture) ? "7.0" : "6.0"
+    cpp.minimumIosVersion: ["armv7s", "arm64", "x86_64"].includes(qbs.architecture) ? "7.0" : "6.0"
     cpp.minimumTvosVersion: "9.0"
     cpp.minimumWatchosVersion: "2.0"
 
diff --git a/tests/auto/blackbox/testdata-apple/ib/assetcatalog/assetcatalogempty.qbs b/tests/auto/blackbox/testdata-apple/ib/assetcatalog/assetcatalogempty.qbs
index 7cbb58051..d06e24eb3 100644
--- a/tests/auto/blackbox/testdata-apple/ib/assetcatalog/assetcatalogempty.qbs
+++ b/tests/auto/blackbox/testdata-apple/ib/assetcatalog/assetcatalogempty.qbs
@@ -3,7 +3,7 @@ import qbs.Utilities
 
 Project {
     condition: {
-        var result = qbs.targetOS.contains("macos");
+        var result = qbs.targetOS.includes("macos");
         if (!result)
             console.info("Skip this test");
         return result;
diff --git a/tests/auto/blackbox/testdata-apple/infoPlistVariables/infoPlistVariables.qbs b/tests/auto/blackbox/testdata-apple/infoPlistVariables/infoPlistVariables.qbs
index 3f083278f..47ca80f07 100644
--- a/tests/auto/blackbox/testdata-apple/infoPlistVariables/infoPlistVariables.qbs
+++ b/tests/auto/blackbox/testdata-apple/infoPlistVariables/infoPlistVariables.qbs
@@ -4,7 +4,7 @@ CppApplication {
     files: ["main.c", "Info.plist"]
 
     Properties {
-        condition: qbs.targetOS.contains("darwin")
+        condition: qbs.targetOS.includes("darwin")
         bundle.isBundle: true
         bundle.identifierPrefix: "com.test"
         bundle.extraEnv: {
diff --git a/tests/auto/blackbox/testdata-apple/multiarch-helpers.js b/tests/auto/blackbox/testdata-apple/multiarch-helpers.js
index 5d1c0f273..a8054b63c 100644
--- a/tests/auto/blackbox/testdata-apple/multiarch-helpers.js
+++ b/tests/auto/blackbox/testdata-apple/multiarch-helpers.js
@@ -34,35 +34,35 @@ var Utilities = require("qbs.Utilities");
 // For example: x86 -> x86_64 on macOS, armv7 -> arm64 on iOS
 
 function enableOldArch(qbs, xcodeVersion) {
-    return qbs.targetOS.contains("macos")
+    return qbs.targetOS.includes("macos")
             && xcodeVersion
             && (Utilities.versionCompare(xcodeVersion, "10") < 0
                 || Utilities.versionCompare(xcodeVersion, "12.2") >= 0)
-            || qbs.targetOS.contains("ios")
+            || qbs.targetOS.includes("ios")
 }
 
 function getNewArch(qbs, xcodeVersion) {
-    if (qbs.targetOS.contains("macos"))
+    if (qbs.targetOS.includes("macos"))
         return xcodeVersion
                 && Utilities.versionCompare(xcodeVersion, "12.2") >= 0 ? "arm64" : "x86_64";
-    else if (qbs.targetOS.contains("ios-simulator"))
+    else if (qbs.targetOS.includes("ios-simulator"))
         return "x86_64"
-    else if (qbs.targetOS.contains("ios"))
+    else if (qbs.targetOS.includes("ios"))
         return "arm64"
-    else if (qbs.targetOS.contains("tvos"))
+    else if (qbs.targetOS.includes("tvos"))
         return "arm64"
-    else if (qbs.targetOS.contains("watchos"))
+    else if (qbs.targetOS.includes("watchos"))
         return "armv7k"
     throw "unsupported targetOS: " + qbs.targetOS;
 }
 
 function getOldArch(qbs, xcodeVersion) {
-    if (qbs.targetOS.contains("macos"))
+    if (qbs.targetOS.includes("macos"))
         return xcodeVersion
                 && Utilities.versionCompare(xcodeVersion, "12.2") >= 0 ? "x86_64" : "x86";
-    else if (qbs.targetOS.contains("ios-simulator"))
+    else if (qbs.targetOS.includes("ios-simulator"))
         return "x86"
-    else if (qbs.targetOS.contains("ios"))
+    else if (qbs.targetOS.includes("ios"))
         return "armv7a"
     throw "unsupported targetOS: " + qbs.targetOS;
 }
diff --git a/tests/auto/blackbox/testdata-apple/objc-arc/objc-arc.qbs b/tests/auto/blackbox/testdata-apple/objc-arc/objc-arc.qbs
index 545d5701c..ce128059f 100644
--- a/tests/auto/blackbox/testdata-apple/objc-arc/objc-arc.qbs
+++ b/tests/auto/blackbox/testdata-apple/objc-arc/objc-arc.qbs
@@ -2,7 +2,7 @@ Product {
     Depends { name: "cpp" }
     consoleApplication: true
     type: ["application"]
-    condition: qbs.targetOS.contains("darwin")
+    condition: qbs.targetOS.includes("darwin")
 
     Group {
         cpp.automaticReferenceCounting: true
diff --git a/tests/auto/blackbox/testdata-apple/overrideInfoPlist/overrideInfoPlist.qbs b/tests/auto/blackbox/testdata-apple/overrideInfoPlist/overrideInfoPlist.qbs
index e70584ed8..270a0792c 100644
--- a/tests/auto/blackbox/testdata-apple/overrideInfoPlist/overrideInfoPlist.qbs
+++ b/tests/auto/blackbox/testdata-apple/overrideInfoPlist/overrideInfoPlist.qbs
@@ -4,7 +4,7 @@ CppApplication {
     files: ["main.c", "Override-Info.plist"]
 
     Properties {
-        condition: qbs.targetOS.contains("darwin")
+        condition: qbs.targetOS.includes("darwin")
         bundle.isBundle: true
         bundle.identifierPrefix: "com.test"
 
diff --git a/tests/auto/blackbox/testdata-apple/xcode/xcode-project.qbs b/tests/auto/blackbox/testdata-apple/xcode/xcode-project.qbs
index fa4c67b96..e7bf4739a 100644
--- a/tests/auto/blackbox/testdata-apple/xcode/xcode-project.qbs
+++ b/tests/auto/blackbox/testdata-apple/xcode/xcode-project.qbs
@@ -16,19 +16,19 @@ Project {
             console.info("Available SDK versions: " + xcode.availableSdkVersions.join(", "));
 
             var targetOsToKey = function(targetOS) {
-                if (targetOS.contains("ios"))
+                if (targetOS.includes("ios"))
                     return "iphoneos";
-                if (targetOS.contains("ios-simulator"))
+                if (targetOS.includes("ios-simulator"))
                     return "iphonesimulator";
-                if (targetOS.contains("macos"))
+                if (targetOS.includes("macos"))
                     return "macosx";
-                if (targetOS.contains("tvos"))
+                if (targetOS.includes("tvos"))
                     return "appletvos";
-                if (targetOS.contains("tvos-simulator"))
+                if (targetOS.includes("tvos-simulator"))
                     return "appletvsimulator";
-                if (targetOS.contains("watchos"))
+                if (targetOS.includes("watchos"))
                     return "watchos";
-                if (targetOS.contains("watchos-simulator"))
+                if (targetOS.includes("watchos-simulator"))
                     return "watchossimulator";
                 throw "Unsupported OS" + targetOS;
             }
diff --git a/tests/auto/blackbox/testdata-baremetal/BareMetalApplication.qbs b/tests/auto/blackbox/testdata-baremetal/BareMetalApplication.qbs
index a11855727..7a35e4e13 100644
--- a/tests/auto/blackbox/testdata-baremetal/BareMetalApplication.qbs
+++ b/tests/auto/blackbox/testdata-baremetal/BareMetalApplication.qbs
@@ -22,7 +22,7 @@ BareMetalProduct {
     }
 
     Group {
-        condition: qbs.toolchain.contains("cosmic")
+        condition: qbs.toolchain.includes("cosmic")
         files: "cosmic.lkf"
         fileTags: "linkerscript"
     }
diff --git a/tests/auto/blackbox/testdata-baremetal/BareMetalProduct.qbs b/tests/auto/blackbox/testdata-baremetal/BareMetalProduct.qbs
index eaddef340..446cfe086 100644
--- a/tests/auto/blackbox/testdata-baremetal/BareMetalProduct.qbs
+++ b/tests/auto/blackbox/testdata-baremetal/BareMetalProduct.qbs
@@ -2,7 +2,7 @@ Product {
     Depends { name: "cpp" }
     cpp.positionIndependentCode: false
     Properties {
-        condition: qbs.toolchain.contains("iar")
+        condition: qbs.toolchain.includes("iar")
             && qbs.architecture === "stm8"
         cpp.driverLinkerFlags: [
             "--config_def", "_CSTACK_SIZE=0x100",
@@ -10,7 +10,7 @@ Product {
         ]
     }
     Properties {
-        condition: qbs.toolchain.contains("iar")
+        condition: qbs.toolchain.includes("iar")
             && qbs.architecture === "rl78"
         cpp.driverLinkerFlags: [
             "--config_def", "_NEAR_HEAP_SIZE=256",
@@ -24,7 +24,7 @@ Product {
         ]
     }
     Properties {
-        condition: qbs.toolchain.contains("iar")
+        condition: qbs.toolchain.includes("iar")
             && qbs.architecture === "rh850"
         cpp.driverLinkerFlags: [
             "--config_def", "CSTACK_SIZE=0x1000",
@@ -33,7 +33,7 @@ Product {
         ]
     }
     Properties {
-        condition: qbs.toolchain.contains("iar")
+        condition: qbs.toolchain.includes("iar")
             && qbs.architecture === "v850"
         cpp.driverLinkerFlags: [
             "-D_CSTACK_SIZE=1000",
@@ -42,7 +42,7 @@ Product {
         ]
     }
     Properties {
-        condition: qbs.toolchain.contains("iar")
+        condition: qbs.toolchain.includes("iar")
             && qbs.architecture === "78k"
         cpp.commonCompilerFlags: [
             "--core", "78k0",
@@ -59,7 +59,7 @@ Product {
         ]
     }
     Properties {
-        condition: qbs.toolchain.contains("iar")
+        condition: qbs.toolchain.includes("iar")
             && qbs.architecture === "sh"
         cpp.driverLinkerFlags: [
             "--config_def", "_CSTACK_SIZE=0x800",
@@ -69,7 +69,7 @@ Product {
         ]
     }
     Properties {
-        condition: qbs.toolchain.contains("iar")
+        condition: qbs.toolchain.includes("iar")
             && qbs.architecture === "hcs8"
         cpp.driverLinkerFlags: [
             "-D_CSTACK_SIZE=200",
@@ -78,7 +78,7 @@ Product {
         ]
     }
     Properties {
-        condition: qbs.toolchain.contains("iar")
+        condition: qbs.toolchain.includes("iar")
             && qbs.architecture === "m32c"
         cpp.driverLinkerFlags: [
             "-D_CSTACK_SIZE=100",
@@ -91,7 +91,7 @@ Product {
         ]
     }
     Properties {
-        condition: qbs.toolchain.contains("iar")
+        condition: qbs.toolchain.includes("iar")
             && qbs.architecture === "riscv"
         cpp.driverLinkerFlags: [
             "--config_def", "CSTACK_SIZE=0x1000",
@@ -99,7 +99,7 @@ Product {
         ]
     }
     Properties {
-        condition: qbs.toolchain.contains("iar")
+        condition: qbs.toolchain.includes("iar")
             && qbs.architecture === "m68k"
         cpp.cFlags: [
             "--no_div"
@@ -117,41 +117,41 @@ Product {
         ]
     }
     Properties {
-        condition: qbs.toolchain.contains("keil")
+        condition: qbs.toolchain.includes("keil")
             && qbs.architecture.startsWith("arm")
             && cpp.compilerName.startsWith("armcc")
         cpp.assemblerFlags: ["--cpu", "cortex-m0"]
         cpp.commonCompilerFlags: ["--cpu", "cortex-m0"]
     }
     Properties {
-        condition: qbs.toolchain.contains("keil")
+        condition: qbs.toolchain.includes("keil")
             && qbs.architecture.startsWith("arm")
             && cpp.compilerName.startsWith("armclang")
         cpp.assemblerFlags: ["--cpu", "cortex-m0"]
         cpp.commonCompilerFlags: ["-mcpu=cortex-m0", "--target=arm-arm-none-eabi"]
     }
     Properties {
-        condition: qbs.toolchain.contains("gcc")
+        condition: qbs.toolchain.includes("gcc")
             && qbs.architecture.startsWith("arm")
         cpp.driverFlags: ["-specs=nosys.specs"]
     }
     Properties {
-        condition: qbs.toolchain.contains("gcc")
+        condition: qbs.toolchain.includes("gcc")
             && qbs.architecture === "xtensa"
         cpp.driverFlags: ["-nostdlib"]
     }
     Properties {
-        condition: qbs.toolchain.contains("gcc")
+        condition: qbs.toolchain.includes("gcc")
             && qbs.architecture === "msp430"
         cpp.driverFlags: ["-mmcu=msp430f5529", "-nostdlib"]
     }
     Properties {
-        condition: qbs.toolchain.contains("gcc")
+        condition: qbs.toolchain.includes("gcc")
             && qbs.architecture === "m32r"
         cpp.driverFlags: ["-nostdlib"]
     }
     Properties {
-        condition: qbs.toolchain.contains("gcc")
+        condition: qbs.toolchain.includes("gcc")
             && qbs.architecture === "riscv"
         cpp.driverFlags: ["-nostdlib"]
     }
diff --git a/tests/auto/blackbox/testdata-baremetal/compiler-defines-by-language/compiler-defines-by-language.qbs b/tests/auto/blackbox/testdata-baremetal/compiler-defines-by-language/compiler-defines-by-language.qbs
index 7eb2af6db..73365ada4 100644
--- a/tests/auto/blackbox/testdata-baremetal/compiler-defines-by-language/compiler-defines-by-language.qbs
+++ b/tests/auto/blackbox/testdata-baremetal/compiler-defines-by-language/compiler-defines-by-language.qbs
@@ -2,11 +2,11 @@ import "../BareMetalApplication.qbs" as BareMetalApplication
 
 Project {
     property bool supportsCpp: {
-        if (qbs.toolchain.contains("cosmic"))
+        if (qbs.toolchain.includes("cosmic"))
             return false;
-        if (qbs.toolchain.contains("sdcc"))
+        if (qbs.toolchain.includes("sdcc"))
             return false;
-        if (qbs.toolchain.contains("keil")) {
+        if (qbs.toolchain.includes("keil")) {
             if (qbs.architecture === "mcs51"
                     || qbs.architecture === "mcs251"
                     || qbs.architecture === "c166") {
diff --git a/tests/auto/blackbox/testdata-baremetal/compiler-listing/compiler-listing.qbs b/tests/auto/blackbox/testdata-baremetal/compiler-listing/compiler-listing.qbs
index bcf983c88..6bd51e3bd 100644
--- a/tests/auto/blackbox/testdata-baremetal/compiler-listing/compiler-listing.qbs
+++ b/tests/auto/blackbox/testdata-baremetal/compiler-listing/compiler-listing.qbs
@@ -2,7 +2,7 @@ import "../BareMetalApplication.qbs" as BareMetalApplication
 
 BareMetalApplication {
     condition: {
-        if (!qbs.toolchain.contains("gcc")) {
+        if (!qbs.toolchain.includes("gcc")) {
             console.info("compiler listing suffix: %%" + cpp.compilerListingSuffix + "%%");
             return true;
         }
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 fffb6a03d..7e7427561 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
@@ -8,7 +8,7 @@ Project {
         destinationDirectory: project.outputLibrariesDirectory
         Depends { name: "cpp" }
         Properties {
-            condition: qbs.targetOS.contains("darwin")
+            condition: qbs.targetOS.includes("darwin")
             bundle.isBundle: false
         }
         files: ["lib-a.c"]
@@ -19,7 +19,7 @@ Project {
         Depends { name: "cpp" }
         Depends { name: "lib-a" }
         Properties {
-            condition: qbs.targetOS.contains("darwin")
+            condition: qbs.targetOS.includes("darwin")
             bundle.isBundle: false
         }
         files: ["lib-b.c"]
diff --git a/tests/auto/blackbox/testdata-clangdb/project1/project.qbs b/tests/auto/blackbox/testdata-clangdb/project1/project.qbs
index ecfc562b0..313f33ead 100644
--- a/tests/auto/blackbox/testdata-clangdb/project1/project.qbs
+++ b/tests/auto/blackbox/testdata-clangdb/project1/project.qbs
@@ -7,8 +7,8 @@ Project {
 Application {
     Probe {
         id: dummy
-        property bool isMingw: qbs.toolchain.contains("mingw")
-        property bool isMsvc: qbs.toolchain.contains("msvc")
+        property bool isMingw: qbs.toolchain.includes("mingw")
+        property bool isMsvc: qbs.toolchain.includes("msvc")
         property var buildEnv: cpp.buildEnv
         configure: {
             if (!buildEnv)
diff --git a/tests/auto/blackbox/testdata-java/java/vehicles.qbs b/tests/auto/blackbox/testdata-java/java/vehicles.qbs
index 2fc01e102..8a4bb732f 100644
--- a/tests/auto/blackbox/testdata-java/java/vehicles.qbs
+++ b/tests/auto/blackbox/testdata-java/java/vehicles.qbs
@@ -7,7 +7,7 @@ Project {
         Depends { name: "cpp" }
         Depends { name: "car_jar" }
         Properties {
-            condition: qbs.targetOS.contains("darwin")
+            condition: qbs.targetOS.includes("darwin")
             bundle.isBundle: false
         }
 
diff --git a/tests/auto/blackbox/testdata-joblimits/job-limits/job-limits.qbs b/tests/auto/blackbox/testdata-joblimits/job-limits/job-limits.qbs
index c9f712a85..76f54807a 100644
--- a/tests/auto/blackbox/testdata-joblimits/job-limits/job-limits.qbs
+++ b/tests/auto/blackbox/testdata-joblimits/job-limits/job-limits.qbs
@@ -19,7 +19,7 @@ Project {
         consoleApplication: true
         cpp.cxxLanguageVersion: "c++14"
         Properties {
-            condition: qbs.targetOS.contains("macos")
+            condition: qbs.targetOS.includes("macos")
             cpp.minimumMacosVersion: "10.9"
         }
         files: "main.cpp"
diff --git a/tests/auto/blackbox/testdata-qt/linker-variant/qt-linker-variant.qbs b/tests/auto/blackbox/testdata-qt/linker-variant/qt-linker-variant.qbs
index ab5889007..c1a77d696 100644
--- a/tests/auto/blackbox/testdata-qt/linker-variant/qt-linker-variant.qbs
+++ b/tests/auto/blackbox/testdata-qt/linker-variant/qt-linker-variant.qbs
@@ -3,7 +3,7 @@ QtApplication {
         id: qtConfigProbe
         property stringList moduleConfig: Qt.core.moduleConfig
         configure: {
-            console.info("Qt requires gold: " + moduleConfig.contains("use_gold_linker"));
+            console.info("Qt requires gold: " + moduleConfig.includes("use_gold_linker"));
         }
     }
     files: "main.cpp"
diff --git a/tests/auto/blackbox/testdata-qt/mixed-build-variants/mixed-build-variants.qbs b/tests/auto/blackbox/testdata-qt/mixed-build-variants/mixed-build-variants.qbs
index 7d8ab1b90..dea30eef4 100644
--- a/tests/auto/blackbox/testdata-qt/mixed-build-variants/mixed-build-variants.qbs
+++ b/tests/auto/blackbox/testdata-qt/mixed-build-variants/mixed-build-variants.qbs
@@ -1,6 +1,6 @@
 QtApplication {
     Properties {
-        condition: qbs.toolchain.contains("msvc")
+        condition: qbs.toolchain.includes("msvc")
         Qt.core.qtBuildVariant: "release"
     }
     Qt.core.qtBuildVariant: "dummy"
diff --git a/tests/auto/blackbox/testdata-qt/no-relink-on-qdebug/symbols-test.qbs b/tests/auto/blackbox/testdata-qt/no-relink-on-qdebug/symbols-test.qbs
index 94a29d2b2..a614d96c4 100644
--- a/tests/auto/blackbox/testdata-qt/no-relink-on-qdebug/symbols-test.qbs
+++ b/tests/auto/blackbox/testdata-qt/no-relink-on-qdebug/symbols-test.qbs
@@ -3,9 +3,9 @@ Project {
         name: "app"
         Depends { name: "lib" }
         property bool dummy: {
-            console.info("is GCC: " + qbs.toolchain.contains("gcc"));
-            console.info("is MinGW: " + qbs.toolchain.contains("mingw"));
-            console.info("is Darwin: " + qbs.targetOS.contains("darwin"));
+            console.info("is GCC: " + qbs.toolchain.includes("gcc"));
+            console.info("is MinGW: " + qbs.toolchain.includes("mingw"));
+            console.info("is Darwin: " + qbs.targetOS.includes("darwin"));
         }
         files: "main.cpp"
     }
diff --git a/tests/auto/blackbox/testdata-qt/plugin-meta-data/plugin-meta-data.qbs b/tests/auto/blackbox/testdata-qt/plugin-meta-data/plugin-meta-data.qbs
index a3067f0b0..dbe64d5ea 100644
--- a/tests/auto/blackbox/testdata-qt/plugin-meta-data/plugin-meta-data.qbs
+++ b/tests/auto/blackbox/testdata-qt/plugin-meta-data/plugin-meta-data.qbs
@@ -23,7 +23,7 @@ Project {
         cpp.cxxLanguageVersion: "c++11"
 
         Properties {
-            condition: qbs.targetOS.contains("unix")
+            condition: qbs.targetOS.includes("unix")
             cpp.rpaths: [cpp.rpathOrigin]
         }
 
@@ -43,12 +43,12 @@ Project {
         Depends { name: "Qt.core" }
 
         Properties {
-            condition: qbs.targetOS.contains("darwin")
+            condition: qbs.targetOS.includes("darwin")
             bundle.isBundle: false
         }
         cpp.defines: [Qt.core.staticBuild ? "QT_STATICPLUGIN" : "QT_PLUGIN"]
         cpp.cxxLanguageVersion: "c++11"
-        cpp.sonamePrefix: qbs.targetOS.contains("darwin") ? "@rpath" : undefined
+        cpp.sonamePrefix: qbs.targetOS.includes("darwin") ? "@rpath" : undefined
         cpp.includePaths: ["."]
         Qt.core.pluginMetaData: ["theKey=theValue"]
 
diff --git a/tests/auto/blackbox/testdata-qt/qtscxml/qtscxml.qbs b/tests/auto/blackbox/testdata-qt/qtscxml/qtscxml.qbs
index 90f7e5b96..6fee91479 100644
--- a/tests/auto/blackbox/testdata-qt/qtscxml/qtscxml.qbs
+++ b/tests/auto/blackbox/testdata-qt/qtscxml/qtscxml.qbs
@@ -42,9 +42,9 @@ Project {
                 cmd.description = "running " + input.filePath;
 
                 var envVars = {};
-                if (Host.os().contains("windows")) {
+                if (Host.os().includes("windows")) {
                     envVars["PATH"] = FileInfo.toWindowsSeparators(input["Qt.core"].binPath);
-                } else if (Host.os().contains("macos")) {
+                } else if (Host.os().includes("macos")) {
                     envVars["DYLD_LIBRARY_PATH"] = input["Qt.core"].libPath;
                     envVars["DYLD_FRAMEWORK_PATH"] = input["Qt.core"].libPath;
                 } else {
diff --git a/tests/auto/blackbox/testdata-qt/static-qt-plugin-linking/static-qt-plugin-linking.qbs b/tests/auto/blackbox/testdata-qt/static-qt-plugin-linking/static-qt-plugin-linking.qbs
index a9608c001..e4e56bb4b 100644
--- a/tests/auto/blackbox/testdata-qt/static-qt-plugin-linking/static-qt-plugin-linking.qbs
+++ b/tests/auto/blackbox/testdata-qt/static-qt-plugin-linking/static-qt-plugin-linking.qbs
@@ -11,12 +11,12 @@ Product {
     }
 
     Group {
-        condition: type.contains("application")
+        condition: type.includes("application")
         files: "main.cpp"
     }
 
     Group {
-        condition: type.contains("staticlibrary")
+        condition: type.includes("staticlibrary")
         files: "lib.cpp"
     }
 
diff --git a/tests/auto/blackbox/testdata-windows/codesign/codesign.qbs b/tests/auto/blackbox/testdata-windows/codesign/codesign.qbs
index f9f49e636..1963f6926 100644
--- a/tests/auto/blackbox/testdata-windows/codesign/codesign.qbs
+++ b/tests/auto/blackbox/testdata-windows/codesign/codesign.qbs
@@ -9,7 +9,7 @@ Project {
     CppApplication {
         name: "A"
         files: "app.cpp"
-        condition: qbs.toolchain.contains("msvc")
+        condition: qbs.toolchain.includes("msvc")
         codesign.enableCodeSigning: project.enableSigning
         codesign.hashAlgorithm: project.hashAlgorithm
         codesign.subjectName: project.subjectName
@@ -27,7 +27,7 @@ Project {
         Depends { name: "cpp" }
         name: "B"
         files: "app.cpp"
-        condition: qbs.toolchain.contains("msvc")
+        condition: qbs.toolchain.includes("msvc")
         codesign.enableCodeSigning: project.enableSigning
         codesign.hashAlgorithm: project.hashAlgorithm
         codesign.subjectName: project.subjectName
diff --git a/tests/auto/blackbox/testdata-windows/innosetup/innosetup.qbs b/tests/auto/blackbox/testdata-windows/innosetup/innosetup.qbs
index 718dec6f5..fd8868900 100644
--- a/tests/auto/blackbox/testdata-windows/innosetup/innosetup.qbs
+++ b/tests/auto/blackbox/testdata-windows/innosetup/innosetup.qbs
@@ -3,7 +3,7 @@ import qbs.FileInfo
 Project {
     InnoSetup {
         property bool _test: {
-            var present = qbs.targetOS.contains("windows") && innosetup.present;
+            var present = qbs.targetOS.includes("windows") && innosetup.present;
             console.info("has innosetup: " + present);
         }
 
diff --git a/tests/auto/blackbox/testdata-windows/innosetupDependencies/innosetupDependencies.qbs b/tests/auto/blackbox/testdata-windows/innosetupDependencies/innosetupDependencies.qbs
index ab68d3011..3ef8c30e7 100644
--- a/tests/auto/blackbox/testdata-windows/innosetupDependencies/innosetupDependencies.qbs
+++ b/tests/auto/blackbox/testdata-windows/innosetupDependencies/innosetupDependencies.qbs
@@ -3,7 +3,7 @@ import qbs.TextFile
 Project {
     InnoSetup {
         property bool _test: {
-            var present = qbs.targetOS.contains("windows") && innosetup.present;
+            var present = qbs.targetOS.includes("windows") && innosetup.present;
             console.info("has innosetup: " + present);
         }
         Depends { name: "app" }
diff --git a/tests/auto/blackbox/testdata-windows/wix/WiXInstallers.qbs b/tests/auto/blackbox/testdata-windows/wix/WiXInstallers.qbs
index 1316d07d7..acc7cf7b3 100644
--- a/tests/auto/blackbox/testdata-windows/wix/WiXInstallers.qbs
+++ b/tests/auto/blackbox/testdata-windows/wix/WiXInstallers.qbs
@@ -20,7 +20,7 @@ Project {
 
     WindowsSetupPackage {
         Depends { name: "QbsSetup" }
-        condition: Host.os().contains("windows") // currently does not work in Wine with WiX 3.9
+        condition: Host.os().includes("windows") // currently does not work in Wine with WiX 3.9
         name: "QbsBootstrapper"
         targetName: "qbs-setup-" + qbs.architecture
         files: ["QbsBootstrapper.wxs"]
diff --git a/tests/auto/blackbox/testdata/assembly/assembly.qbs b/tests/auto/blackbox/testdata/assembly/assembly.qbs
index f7bd4ecad..9d5584af5 100644
--- a/tests/auto/blackbox/testdata/assembly/assembly.qbs
+++ b/tests/auto/blackbox/testdata/assembly/assembly.qbs
@@ -30,9 +30,9 @@ Project {
         name : "testa"
         files : [ "testa.s" ]
         Depends { name: "cpp" }
-        condition: qbs.toolchain.contains("gcc")
+        condition: qbs.toolchain.includes("gcc")
         Properties {
-            condition: qbs.targetOS.contains("darwin")
+            condition: qbs.targetOS.includes("darwin")
             bundle.isBundle: false
         }
     }
@@ -40,9 +40,9 @@ Project {
         name : "testb"
         files : [ "testb.S" ]
         Depends { name: "cpp" }
-        condition: qbs.toolchain.contains("gcc")
+        condition: qbs.toolchain.includes("gcc")
         Properties {
-            condition: qbs.targetOS.contains("darwin")
+            condition: qbs.targetOS.includes("darwin")
             bundle.isBundle: false
         }
     }
@@ -50,9 +50,9 @@ Project {
         name : "testc"
         files : [ "testc.sx" ]
         Depends { name: "cpp" }
-        condition: qbs.toolchain.contains("gcc")
+        condition: qbs.toolchain.includes("gcc")
         Properties {
-            condition: qbs.targetOS.contains("darwin")
+            condition: qbs.targetOS.includes("darwin")
             bundle.isBundle: false
         }
     }
@@ -63,10 +63,10 @@ Project {
             files: ["testd_" + qbs.architecture + ".asm"]
         }
         Depends { name: "cpp" }
-        condition: qbs.toolchain.contains("msvc")
+        condition: qbs.toolchain.includes("msvc")
                    && (qbs.architecture === "x86" || qbs.architecture === "x86_64")
         Properties {
-            condition: qbs.targetOS.contains("darwin")
+            condition: qbs.targetOS.includes("darwin")
             bundle.isBundle: false
         }
     }
diff --git a/tests/auto/blackbox/testdata/autotest-timeout/autotests-timeout.qbs b/tests/auto/blackbox/testdata/autotest-timeout/autotests-timeout.qbs
index 08de04fc7..b6094ed22 100644
--- a/tests/auto/blackbox/testdata/autotest-timeout/autotests-timeout.qbs
+++ b/tests/auto/blackbox/testdata/autotest-timeout/autotests-timeout.qbs
@@ -14,7 +14,7 @@ Project {
         cpp.cxxLanguageVersion: "c++11"
         cpp.minimumOsxVersion: "10.8" // For <chrono>
         Properties {
-            condition: qbs.toolchain.contains("gcc")
+            condition: qbs.toolchain.includes("gcc")
             cpp.driverFlags: "-pthread"
         }
         files: "test-main.cpp"
@@ -22,7 +22,7 @@ Project {
     AutotestRunner {
         Depends {
             name: "cpp" // Make sure build environment is set up properly.
-            condition: Host.os().contains("windows") && qbs.toolchain.contains("gcc")
+            condition: Host.os().includes("windows") && qbs.toolchain.includes("gcc")
         }
     }
 }
diff --git a/tests/auto/blackbox/testdata/autotest-with-dependencies/autotest-with-dependencies.qbs b/tests/auto/blackbox/testdata/autotest-with-dependencies/autotest-with-dependencies.qbs
index 8f4634368..bea74796a 100644
--- a/tests/auto/blackbox/testdata/autotest-with-dependencies/autotest-with-dependencies.qbs
+++ b/tests/auto/blackbox/testdata/autotest-with-dependencies/autotest-with-dependencies.qbs
@@ -30,7 +30,7 @@ Project {
     AutotestRunner {
         Depends {
             name: "cpp" // Make sure build environment is set up properly.
-            condition: Host.os().contains("windows") && qbs.toolchain.contains("gcc")
+            condition: Host.os().includes("windows") && qbs.toolchain.includes("gcc")
         }
         arguments: FileInfo.joinPaths(qbs.installRoot, qbs.installPrefix, "bin")
         auxiliaryInputs: "test-helper"
diff --git a/tests/auto/blackbox/testdata/autotests/autotests.qbs b/tests/auto/blackbox/testdata/autotests/autotests.qbs
index dc27d8288..cfb7fc560 100644
--- a/tests/auto/blackbox/testdata/autotests/autotests.qbs
+++ b/tests/auto/blackbox/testdata/autotests/autotests.qbs
@@ -11,7 +11,7 @@ Project {
         }
         Depends {
             name: "cpp" // Make sure build environment is set up properly.
-            condition: Host.os().contains("windows") && qbs.toolchain.contains("gcc")
+            condition: Host.os().includes("windows") && qbs.toolchain.includes("gcc")
         }
     }
 }
diff --git a/tests/auto/blackbox/testdata/buildenv-change/buildenv-change.qbs b/tests/auto/blackbox/testdata/buildenv-change/buildenv-change.qbs
index 6c0bcc73e..54005e76a 100644
--- a/tests/auto/blackbox/testdata/buildenv-change/buildenv-change.qbs
+++ b/tests/auto/blackbox/testdata/buildenv-change/buildenv-change.qbs
@@ -3,7 +3,7 @@ CppApplication {
         id: dummy
         property stringList toolchain: qbs.toolchain
         configure: {
-            if (toolchain.contains("msvc"))
+            if (toolchain.includes("msvc"))
                 console.info("msvc");
         }
     }
diff --git a/tests/auto/blackbox/testdata/change-tracking-and-multiplexing/change-tracking-and-multiplexing.qbs b/tests/auto/blackbox/testdata/change-tracking-and-multiplexing/change-tracking-and-multiplexing.qbs
index d1215355c..096778cd3 100644
--- a/tests/auto/blackbox/testdata/change-tracking-and-multiplexing/change-tracking-and-multiplexing.qbs
+++ b/tests/auto/blackbox/testdata/change-tracking-and-multiplexing/change-tracking-and-multiplexing.qbs
@@ -1,8 +1,8 @@
 StaticLibrary {
     name: "l"
 
-    Depends { condition: qbs.targetOS.contains("darwin"); name: "bundle" }
-    Properties { condition: qbs.targetOS.contains("darwin"); bundle.isBundle: false }
+    Depends { condition: qbs.targetOS.includes("darwin"); name: "bundle" }
+    Properties { condition: qbs.targetOS.includes("darwin"); bundle.isBundle: false }
 
     multiplexByQbsProperties: ["buildVariants"]
     qbs.buildVariants: ["debug", "release"]
diff --git a/tests/auto/blackbox/testdata/choose-module-instance/other-searchpath/modules/limerick/generic.qbs b/tests/auto/blackbox/testdata/choose-module-instance/other-searchpath/modules/limerick/generic.qbs
index 2ebaaac11..bd8e901c7 100644
--- a/tests/auto/blackbox/testdata/choose-module-instance/other-searchpath/modules/limerick/generic.qbs
+++ b/tests/auto/blackbox/testdata/choose-module-instance/other-searchpath/modules/limerick/generic.qbs
@@ -1,3 +1,3 @@
 Module {
-    condition: !qbs.targetOS.contains("Beatles")
+    condition: !qbs.targetOS.includes("Beatles")
 }
diff --git a/tests/auto/blackbox/testdata/clean/clean.qbs b/tests/auto/blackbox/testdata/clean/clean.qbs
index ce3a8eb12..10eca2d41 100644
--- a/tests/auto/blackbox/testdata/clean/clean.qbs
+++ b/tests/auto/blackbox/testdata/clean/clean.qbs
@@ -5,7 +5,7 @@ Project {
         name: "dep"
         files: "dep.cpp"
         Properties {
-            condition: qbs.targetOS.contains("darwin")
+            condition: qbs.targetOS.includes("darwin")
             bundle.isBundle: false
         }
     }
diff --git a/tests/auto/blackbox/testdata/cli/dotnettest.qbs b/tests/auto/blackbox/testdata/cli/dotnettest.qbs
index 9a10b8068..5685be8c4 100644
--- a/tests/auto/blackbox/testdata/cli/dotnettest.qbs
+++ b/tests/auto/blackbox/testdata/cli/dotnettest.qbs
@@ -1,7 +1,7 @@
 Project {
     Application {
         Depends { name: "cli" }
-        Depends { name: "HelloWorldModule"; condition: !qbs.toolchain.contains("mono") }
+        Depends { name: "HelloWorldModule"; condition: !qbs.toolchain.includes("mono") }
         Depends { name: "NetLib" }
 
         type: "application"
@@ -16,7 +16,7 @@ Project {
 
     // Mono's VB compiler doesn't support modules yet, and if we try with C#, it crashes anyways
     NetModule {
-        condition: !qbs.toolchain.contains("mono")
+        condition: !qbs.toolchain.includes("mono")
         Depends { name: "cli" }
 
         name: "HelloWorldModule"
@@ -37,7 +37,7 @@ Project {
 
         // fill-in for missing NetModule
         Group {
-            condition: qbs.toolchain.contains("mono")
+            condition: qbs.toolchain.includes("mono")
             files: ["Module.cs"]
         }
 
diff --git a/tests/auto/blackbox/testdata/command-file/command-file.qbs b/tests/auto/blackbox/testdata/command-file/command-file.qbs
index 8e25221c5..87dd0e054 100644
--- a/tests/auto/blackbox/testdata/command-file/command-file.qbs
+++ b/tests/auto/blackbox/testdata/command-file/command-file.qbs
@@ -4,7 +4,7 @@ Project {
         destinationDirectory: project.buildDirectory
         Depends { name: "cpp" }
         Properties {
-            condition: qbs.targetOS.contains("darwin")
+            condition: qbs.targetOS.includes("darwin")
             bundle.isBundle: false
         }
         files: ["lib.cpp"]
@@ -14,6 +14,6 @@ Project {
         cpp.libraryPaths: project.buildDirectory
         files: ["main.cpp"]
         cpp.staticLibraries: ['@' + sourceDirectory + '/'
-                + (qbs.toolchain.contains("msvc") ? "list.msvc" : "list.gcc")]
+                + (qbs.toolchain.includes("msvc") ? "list.msvc" : "list.gcc")]
     }
 }
diff --git a/tests/auto/blackbox/testdata/compilerDefinesByLanguage/CppDefinesApp.qbs b/tests/auto/blackbox/testdata/compilerDefinesByLanguage/CppDefinesApp.qbs
index b205ef2a7..f2da212f6 100644
--- a/tests/auto/blackbox/testdata/compilerDefinesByLanguage/CppDefinesApp.qbs
+++ b/tests/auto/blackbox/testdata/compilerDefinesByLanguage/CppDefinesApp.qbs
@@ -1,7 +1,7 @@
 CppApplication {
     files: ["app.c"]
 
-    property bool enableObjectiveC: qbs.targetOS.contains("darwin")
+    property bool enableObjectiveC: qbs.targetOS.includes("darwin")
 
     Group {
         name: "C/C++"
diff --git a/tests/auto/blackbox/testdata/configure/modules/definition/module.qbs b/tests/auto/blackbox/testdata/configure/modules/definition/module.qbs
index 1d647faa2..6a1dbe67d 100644
--- a/tests/auto/blackbox/testdata/configure/modules/definition/module.qbs
+++ b/tests/auto/blackbox/testdata/configure/modules/definition/module.qbs
@@ -12,7 +12,7 @@ Module {
             var cmd;
             var args;
             var p = path;
-            if (targetOS.contains("windows")) {
+            if (targetOS.includes("windows")) {
                 cmd = windowsShellPath;
                 args = ["/c", "date", "/t"];
             } else {
diff --git a/tests/auto/blackbox/testdata/cpu-features/cpu-features.qbs b/tests/auto/blackbox/testdata/cpu-features/cpu-features.qbs
index 0bfdaceba..36e805516 100644
--- a/tests/auto/blackbox/testdata/cpu-features/cpu-features.qbs
+++ b/tests/auto/blackbox/testdata/cpu-features/cpu-features.qbs
@@ -8,7 +8,7 @@ CppApplication {
     property bool dummy: {
         console.info("is x86: " + (qbs.architecture === "x86"));
         console.info("is x64: " + (qbs.architecture === "x86_64"));
-        console.info("is gcc: " + qbs.toolchain.contains("gcc"));
-        console.info("is msvc: " + qbs.toolchain.contains("msvc"));
+        console.info("is gcc: " + qbs.toolchain.includes("gcc"));
+        console.info("is msvc: " + qbs.toolchain.includes("msvc"));
     }
 }
diff --git a/tests/auto/blackbox/testdata/cxx-language-version/cxx-language-version.qbs b/tests/auto/blackbox/testdata/cxx-language-version/cxx-language-version.qbs
index 322ded85c..24c37951c 100644
--- a/tests/auto/blackbox/testdata/cxx-language-version/cxx-language-version.qbs
+++ b/tests/auto/blackbox/testdata/cxx-language-version/cxx-language-version.qbs
@@ -13,10 +13,10 @@ CppApplication {
             var isEvenNewerMsvc;
             var isOlderMsvc;
             var isGcc;
-            if (toolchain.contains("clang-cl")) {
+            if (toolchain.includes("clang-cl")) {
                 isEvenNewerMsvc = true;
                 isNewerMsvc = true;
-            } else if (toolchain.contains("msvc")) {
+            } else if (toolchain.includes("msvc")) {
                 if (compilerVersion >= "19.12.25831")
                     isEvenNewerMsvc = true;
                 if (compilerVersion >= "18.00.30723")
diff --git a/tests/auto/blackbox/testdata/discard-unused-data/discard-unused-data.qbs b/tests/auto/blackbox/testdata/discard-unused-data/discard-unused-data.qbs
index fdd3aa1f7..367bb665c 100644
--- a/tests/auto/blackbox/testdata/discard-unused-data/discard-unused-data.qbs
+++ b/tests/auto/blackbox/testdata/discard-unused-data/discard-unused-data.qbs
@@ -4,9 +4,9 @@ CppApplication {
 
     files: "main.cpp"
 
-    Depends { name: "bundle"; condition: qbs.targetOS.contains("darwin") }
+    Depends { name: "bundle"; condition: qbs.targetOS.includes("darwin") }
     Properties {
-        condition: qbs.targetOS.contains("darwin")
+        condition: qbs.targetOS.includes("darwin")
         bundle.isBundle: false
     }
 
@@ -17,7 +17,7 @@ CppApplication {
             var cmd = new JavaScriptCommand();
             cmd.silent = true;
             cmd.sourceCode = function() {
-                console.info("is Darwin: " + product.qbs.targetOS.contains("darwin"));
+                console.info("is Darwin: " + product.qbs.targetOS.includes("darwin"));
                 console.info("---" + product.cpp.nmPath + "---");
             }
             return [cmd];
diff --git a/tests/auto/blackbox/testdata/driver-linker-flags/driver-linker-flags.qbs b/tests/auto/blackbox/testdata/driver-linker-flags/driver-linker-flags.qbs
index 5de0fe053..57f096494 100644
--- a/tests/auto/blackbox/testdata/driver-linker-flags/driver-linker-flags.qbs
+++ b/tests/auto/blackbox/testdata/driver-linker-flags/driver-linker-flags.qbs
@@ -8,7 +8,7 @@ CppApplication {
 
     Probe {
         id: toolchainProbe
-        condition: qbs.toolchain.contains("gcc")
+        condition: qbs.toolchain.includes("gcc")
         configure: {
             console.info("toolchain is GCC-like");
             found = true;
diff --git a/tests/auto/blackbox/testdata/dynamic-library-in-module/Dll.qbs b/tests/auto/blackbox/testdata/dynamic-library-in-module/Dll.qbs
index 1acf606dc..c95d88052 100644
--- a/tests/auto/blackbox/testdata/dynamic-library-in-module/Dll.qbs
+++ b/tests/auto/blackbox/testdata/dynamic-library-in-module/Dll.qbs
@@ -1,8 +1,8 @@
 DynamicLibrary {
     Depends { name: "cpp" }
-    Depends { name: "bundle"; condition: qbs.targetOS.contains("darwin") }
+    Depends { name: "bundle"; condition: qbs.targetOS.includes("darwin") }
     Properties {
-        condition: qbs.targetOS.contains("darwin")
+        condition: qbs.targetOS.includes("darwin")
         bundle.isBundle: false
         cpp.minimumMacosVersion: "10.7" // For -rpath
     }
diff --git a/tests/auto/blackbox/testdata/dynamic-library-in-module/modules/thelib/thelib.qbs b/tests/auto/blackbox/testdata/dynamic-library-in-module/modules/thelib/thelib.qbs
index 30f87337d..3059fa5e9 100644
--- a/tests/auto/blackbox/testdata/dynamic-library-in-module/modules/thelib/thelib.qbs
+++ b/tests/auto/blackbox/testdata/dynamic-library-in-module/modules/thelib/thelib.qbs
@@ -13,7 +13,7 @@ Module {
     }
     Group {
         name: "thelib dll import"
-        condition: qbs.targetOS.contains("windows")
+        condition: qbs.targetOS.includes("windows")
         files: FileInfo.joinPaths(product.thelib.baseDir, "thelib.lib")
         fileTags: ["dynamiclibrary_import"]
         filesAreTargets: true
diff --git a/tests/auto/blackbox/testdata/dynamic-library-in-module/modules/theotherlib/theotherlib.qbs b/tests/auto/blackbox/testdata/dynamic-library-in-module/modules/theotherlib/theotherlib.qbs
index 1eb1e01a5..f387feb80 100644
--- a/tests/auto/blackbox/testdata/dynamic-library-in-module/modules/theotherlib/theotherlib.qbs
+++ b/tests/auto/blackbox/testdata/dynamic-library-in-module/modules/theotherlib/theotherlib.qbs
@@ -13,7 +13,7 @@ Module {
     }
     Group {
         name: "theotherlib dll import"
-        condition: qbs.targetOS.contains("windows")
+        condition: qbs.targetOS.includes("windows")
         files: FileInfo.joinPaths(product.theotherlib.baseDir, "theotherlib.lib")
         fileTags: ["dynamiclibrary_import"]
         filesAreTargets: true
diff --git a/tests/auto/blackbox/testdata/enableExceptions/exceptions.qbs b/tests/auto/blackbox/testdata/enableExceptions/exceptions.qbs
index 9a75043a8..e1d09f7e0 100644
--- a/tests/auto/blackbox/testdata/enableExceptions/exceptions.qbs
+++ b/tests/auto/blackbox/testdata/enableExceptions/exceptions.qbs
@@ -1,5 +1,5 @@
 CppApplication {
     files: ["main.cpp"]
     cpp.treatWarningsAsErrors: true
-    cpp.defines: qbs.toolchain.contains("msvc") && !cpp.enableExceptions ? ["FORCE_FAIL_VS"] : []
+    cpp.defines: qbs.toolchain.includes("msvc") && !cpp.enableExceptions ? ["FORCE_FAIL_VS"] : []
 }
diff --git a/tests/auto/blackbox/testdata/enableExceptions/none.qbs b/tests/auto/blackbox/testdata/enableExceptions/none.qbs
index 8fb052476..439ea3037 100644
--- a/tests/auto/blackbox/testdata/enableExceptions/none.qbs
+++ b/tests/auto/blackbox/testdata/enableExceptions/none.qbs
@@ -2,7 +2,7 @@ CppApplication {
     files: ["emptymain.cpp"]
 
     Group {
-        condition: qbs.targetOS.contains("darwin")
+        condition: qbs.targetOS.includes("darwin")
         files: ["empty.m", "empty.mm"]
     }
 }
diff --git a/tests/auto/blackbox/testdata/exports-pkgconfig/exports-pkgconfig.qbs b/tests/auto/blackbox/testdata/exports-pkgconfig/exports-pkgconfig.qbs
index 94632053a..23331f93f 100644
--- a/tests/auto/blackbox/testdata/exports-pkgconfig/exports-pkgconfig.qbs
+++ b/tests/auto/blackbox/testdata/exports-pkgconfig/exports-pkgconfig.qbs
@@ -43,7 +43,7 @@ Project {
             Depends { name: "Qt.core"; required: false }
             Depends { name: "helper1" }
             Depends { name: "helper3" }
-            property bool someCondition: Host.os().contains("windows") // hostOS for easier testing
+            property bool someCondition: Host.os().includes("windows") // hostOS for easier testing
             property bool someOtherCondition: someCondition
             Properties {
                 condition: !someOtherCondition
diff --git a/tests/auto/blackbox/testdata/exports-qbs/lib.qbs b/tests/auto/blackbox/testdata/exports-qbs/lib.qbs
index 453dac562..951b0fa74 100644
--- a/tests/auto/blackbox/testdata/exports-qbs/lib.qbs
+++ b/tests/auto/blackbox/testdata/exports-qbs/lib.qbs
@@ -16,7 +16,7 @@ DynamicLibrary {
     cpp.defines: ["MYLIB_BUILD"]
     cpp.variantSuffix: qbs.buildVariant === "debug" ? "d" : ""
     Properties {
-        condition: qbs.targetOS.contains("darwin")
+        condition: qbs.targetOS.includes("darwin")
         bundle.isBundle: false
     }
     files: ["mylib.cpp"]
diff --git a/tests/auto/blackbox/testdata/external-libs/external-libs.qbs b/tests/auto/blackbox/testdata/external-libs/external-libs.qbs
index 619f40867..610df0507 100644
--- a/tests/auto/blackbox/testdata/external-libs/external-libs.qbs
+++ b/tests/auto/blackbox/testdata/external-libs/external-libs.qbs
@@ -7,7 +7,7 @@ Project {
         destinationDirectory: project.libDir
         Depends { name: "cpp" }
         Properties {
-            condition: qbs.targetOS.contains("darwin")
+            condition: qbs.targetOS.includes("darwin")
             bundle.isBundle: false
         }
         files: ["lib1.cpp"]
@@ -18,7 +18,7 @@ Project {
         Depends { name: "cpp" }
         Depends { name: "lib1" }
         Properties {
-            condition: qbs.targetOS.contains("darwin")
+            condition: qbs.targetOS.includes("darwin")
             bundle.isBundle: false
         }
         files: ["lib2.cpp"]
diff --git a/tests/auto/blackbox/testdata/generate-linker-map-file/generate-linker-map-file.qbs b/tests/auto/blackbox/testdata/generate-linker-map-file/generate-linker-map-file.qbs
index 8c971a747..0d67fa54c 100644
--- a/tests/auto/blackbox/testdata/generate-linker-map-file/generate-linker-map-file.qbs
+++ b/tests/auto/blackbox/testdata/generate-linker-map-file/generate-linker-map-file.qbs
@@ -3,13 +3,13 @@ Project {
         name: "app-map"
         files: ["main.cpp"]
         // lld-link has different flag for map files, test it by switching to "lld" linkerVariant
-        Properties { condition: qbs.toolchain.contains("clang-cl"); cpp.linkerVariant: "lld" }
+        Properties { condition: qbs.toolchain.includes("clang-cl"); cpp.linkerVariant: "lld" }
         cpp.generateLinkerMapFile: true
     }
     CppApplication {
         name: "app-nomap"
         files: ["main.cpp"]
-        Properties { condition: qbs.toolchain.contains("clang-cl"); cpp.linkerVariant: "lld" }
+        Properties { condition: qbs.toolchain.includes("clang-cl"); cpp.linkerVariant: "lld" }
         cpp.generateLinkerMapFile: false
     }
     CppApplication {
@@ -19,8 +19,8 @@ Project {
 
     Probe {
         id: toolchainProbe
-        property bool isUsed: qbs.toolchain.contains("msvc")
-            || qbs.toolchain.contains("gcc")
+        property bool isUsed: qbs.toolchain.includes("msvc")
+            || qbs.toolchain.includes("gcc")
         configure: {
             console.info("use test: " + isUsed);
         }
diff --git a/tests/auto/blackbox/testdata/generator/generator.qbs b/tests/auto/blackbox/testdata/generator/generator.qbs
index d0857beb5..9f6d452e7 100644
--- a/tests/auto/blackbox/testdata/generator/generator.qbs
+++ b/tests/auto/blackbox/testdata/generator/generator.qbs
@@ -18,12 +18,12 @@ CppApplication {
                 var f = new TextFile(input.filePath, TextFile.ReadOnly);
                 var content = f.readAll();
                 f.close();
-                if (content.contains("file1")) {
+                if (content.includes("file1")) {
                     f = new TextFile(outputs.file1[0].filePath, TextFile.WriteOnly);
                     f.writeLine("void f1() {}");
                     f.close();
                 }
-                if (content.contains("file2")) {
+                if (content.includes("file2")) {
                     f = new TextFile(outputs.file2[0].filePath, TextFile.WriteOnly);
                     f.writeLine("void f2() {}");
                     f.close();
diff --git a/tests/auto/blackbox/testdata/input-tags-change-tracking/input-tags-change-tracking.qbs b/tests/auto/blackbox/testdata/input-tags-change-tracking/input-tags-change-tracking.qbs
index ef2c5c55b..1e4248009 100644
--- a/tests/auto/blackbox/testdata/input-tags-change-tracking/input-tags-change-tracking.qbs
+++ b/tests/auto/blackbox/testdata/input-tags-change-tracking/input-tags-change-tracking.qbs
@@ -43,10 +43,10 @@ Product {
         inputs: "txt"
         outputFileTags: "p_tag"
         outputArtifacts: {
-            if (input.fileTags.contains("empty"))
+            if (input.fileTags.includes("empty"))
                 return [];
             return [{
-                filePath: input.fileTags.contains("y") ? "y.out" : "x.out",
+                filePath: input.fileTags.includes("y") ? "y.out" : "x.out",
                 fileTags: "p_tag"
             }]
         }
diff --git a/tests/auto/blackbox/testdata/install-locations/install-locations.qbs b/tests/auto/blackbox/testdata/install-locations/install-locations.qbs
index 994b4b146..ba51c0dc1 100644
--- a/tests/auto/blackbox/testdata/install-locations/install-locations.qbs
+++ b/tests/auto/blackbox/testdata/install-locations/install-locations.qbs
@@ -1,16 +1,16 @@
 Project {
     property bool dummy: {
-        if (qbs.targetOS.contains("windows")) {
+        if (qbs.targetOS.includes("windows")) {
             console.info("is windows");
-        } else if (qbs.targetOS.contains("darwin")) {
+        } else if (qbs.targetOS.includes("darwin")) {
             console.info("is darwin");
-            if (qbs.targetOS.contains("macos"))
+            if (qbs.targetOS.includes("macos"))
                 console.info("is mac");
         } else {
             console.info("is unix");
         }
 
-        if (qbs.toolchain.contains("mingw"))
+        if (qbs.toolchain.includes("mingw"))
             console.info("is mingw");
     }
     CppApplication {
diff --git a/tests/auto/blackbox/testdata/installpackage/installpackage.qbs b/tests/auto/blackbox/testdata/installpackage/installpackage.qbs
index a0649a578..3396b79a4 100644
--- a/tests/auto/blackbox/testdata/installpackage/installpackage.qbs
+++ b/tests/auto/blackbox/testdata/installpackage/installpackage.qbs
@@ -2,7 +2,7 @@ Project {
     CppApplication {
         name: "public_tool"
         Properties {
-            condition: qbs.targetOS.contains("darwin")
+            condition: qbs.targetOS.includes("darwin")
             bundle.isBundle: false
         }
         Depends { name: "mylib" }
@@ -20,7 +20,7 @@ Project {
     }
     DynamicLibrary {
         Properties {
-            condition: qbs.targetOS.contains("darwin")
+            condition: qbs.targetOS.includes("darwin")
             bundle.isBundle: false
         }
         Depends { name: "cpp" }
diff --git a/tests/auto/blackbox/testdata/jsextensions-file/file.qbs b/tests/auto/blackbox/testdata/jsextensions-file/file.qbs
index 6adf714e2..7a47cf3cd 100644
--- a/tests/auto/blackbox/testdata/jsextensions-file/file.qbs
+++ b/tests/auto/blackbox/testdata/jsextensions-file/file.qbs
@@ -33,10 +33,10 @@ Product {
                 if (!created || !File.exists(zePath))
                     throw new Error("zePath was not created.");
                 var entries = File.directoryEntries(product.sourceDirectory, File.AllEntries | File.NoDotAndDotDot);
-                if (entries.length < 3 || !entries.contains("file.qbs"))
+                if (entries.length < 3 || !entries.includes("file.qbs"))
                     throw new Error("Directory did not contain file.qbs");
                 entries = File.directoryEntries(product.sourceDirectory, File.Dirs | File.NoDotAndDotDot);
-                if (entries.length < 1 || !entries.contains("zePath"))
+                if (entries.length < 1 || !entries.includes("zePath"))
                     throw new Error("Directory did not contain only zePath");
                 var moveSource = FileInfo.joinPaths(product.sourceDirectory, "tomove.txt");
                 var moveTarget = FileInfo.joinPaths(product.sourceDirectory, "moved.txt");
diff --git a/tests/auto/blackbox/testdata/jsextensions-process/process.qbs b/tests/auto/blackbox/testdata/jsextensions-process/process.qbs
index fa184fa91..50f22cdfc 100644
--- a/tests/auto/blackbox/testdata/jsextensions-process/process.qbs
+++ b/tests/auto/blackbox/testdata/jsextensions-process/process.qbs
@@ -55,7 +55,7 @@ Project {
 
                     // closeWriteChannel test
                     process = new Process();
-                    if (Host.os().contains("windows"))
+                    if (Host.os().includes("windows"))
                         process.start(product.qbs.windowsShellPath,
                             ["/C", product.qbs.windowsSystemRoot + "\\system32\\sort.exe"]);
                     else
@@ -76,7 +76,7 @@ Project {
                     testReadlineFile.close();
 
                     process = new Process();
-                    if (Host.os().contains("windows"))
+                    if (Host.os().includes("windows"))
                         process.exec(product.qbs.windowsShellPath,
                                      ["/C", "type", "123.txt"],
                                      true);
diff --git a/tests/auto/blackbox/testdata/ld/ld.qbs b/tests/auto/blackbox/testdata/ld/ld.qbs
index 25fede1b0..cb04d3d9a 100644
--- a/tests/auto/blackbox/testdata/ld/ld.qbs
+++ b/tests/auto/blackbox/testdata/ld/ld.qbs
@@ -5,7 +5,7 @@ Project {
         targetName: "qbs can handle any file paths, even the crazy ones! ;)"
         files: ["coreutils.cpp", "coreutils.h"]
         Properties {
-            condition: qbs.targetOS.contains("darwin")
+            condition: qbs.targetOS.includes("darwin")
             bundle.isBundle: false
             cpp.sonamePrefix: "@rpath"
         }
diff --git a/tests/auto/blackbox/testdata/lexyacc/modules/bisonhelper/bisonhelper.qbs b/tests/auto/blackbox/testdata/lexyacc/modules/bisonhelper/bisonhelper.qbs
index cb93547d4..4cce9a1e3 100644
--- a/tests/auto/blackbox/testdata/lexyacc/modules/bisonhelper/bisonhelper.qbs
+++ b/tests/auto/blackbox/testdata/lexyacc/modules/bisonhelper/bisonhelper.qbs
@@ -7,7 +7,7 @@ Module {
         property string yaccBinary: lex_yacc.yaccBinary
         configure: {
             var p = Process();
-            found = p.exec(yaccBinary, ["-V"]) == 0 && p.readStdOut().contains("bison");
+            found = p.exec(yaccBinary, ["-V"]) == 0 && p.readStdOut().includes("bison");
             p.close();
         }
     }
diff --git a/tests/auto/blackbox/testdata/lexyacc/one-grammar/one-grammar.qbs b/tests/auto/blackbox/testdata/lexyacc/one-grammar/one-grammar.qbs
index 243ab09b5..faa5d1fac 100644
--- a/tests/auto/blackbox/testdata/lexyacc/one-grammar/one-grammar.qbs
+++ b/tests/auto/blackbox/testdata/lexyacc/one-grammar/one-grammar.qbs
@@ -19,10 +19,10 @@ CppApplication {
     Probe {
         id: pathCheck
         property string theDir: {
-            if (qbs.targetOS.contains("windows")) {
-                if (qbs.toolchain.contains("mingw"))
+            if (qbs.targetOS.includes("windows")) {
+                if (qbs.toolchain.includes("mingw"))
                     return cpp.toolchainInstallPath;
-                if (qbs.toolchain.contains("clang") && qbs.sysroot)
+                if (qbs.toolchain.includes("clang") && qbs.sysroot)
                     return qbs.sysroot + "/bin";
             }
         }
diff --git a/tests/auto/blackbox/testdata/lexyacc/two-grammars/two-grammars.qbs b/tests/auto/blackbox/testdata/lexyacc/two-grammars/two-grammars.qbs
index a126d725d..648860d9c 100644
--- a/tests/auto/blackbox/testdata/lexyacc/two-grammars/two-grammars.qbs
+++ b/tests/auto/blackbox/testdata/lexyacc/two-grammars/two-grammars.qbs
@@ -5,7 +5,7 @@ CppApplication {
     consoleApplication: true
     cpp.includePaths: ".."
     Properties {
-        condition: Host.os().contains("darwin") && qbs.toolchain.contains("clang")
+        condition: Host.os().includes("darwin") && qbs.toolchain.includes("clang")
         cpp.cFlags: "-Wno-implicit-function-declaration"
     }
     files: [
diff --git a/tests/auto/blackbox/testdata/linker-variant/linker-variant.qbs b/tests/auto/blackbox/testdata/linker-variant/linker-variant.qbs
index 57bd4ccba..9256bf767 100644
--- a/tests/auto/blackbox/testdata/linker-variant/linker-variant.qbs
+++ b/tests/auto/blackbox/testdata/linker-variant/linker-variant.qbs
@@ -3,7 +3,7 @@ CppApplication {
     property string linkerVariant
     Probe {
         id: gccProbe
-        property bool isGcc: qbs.toolchain.contains("gcc")
+        property bool isGcc: qbs.toolchain.includes("gcc")
         configure: {
             console.info("is GCC: " + isGcc);
             if (isGcc)
diff --git a/tests/auto/blackbox/testdata/linkerMode/linkerMode.qbs b/tests/auto/blackbox/testdata/linkerMode/linkerMode.qbs
index 1be50c0aa..9934efb04 100644
--- a/tests/auto/blackbox/testdata/linkerMode/linkerMode.qbs
+++ b/tests/auto/blackbox/testdata/linkerMode/linkerMode.qbs
@@ -24,7 +24,7 @@ Project {
     }
 
     CppApplication {
-        condition: qbs.targetOS.contains("darwin")
+        condition: qbs.targetOS.includes("darwin")
 
         consoleApplication: true
         name: "LinkedProduct-Objective-C"
@@ -50,7 +50,7 @@ Project {
     }
 
     CppApplication {
-        condition: qbs.targetOS.contains("darwin")
+        condition: qbs.targetOS.includes("darwin")
 
         consoleApplication: true
         name: "LinkedProduct-Objective-C++"
diff --git a/tests/auto/blackbox/testdata/loadablemodule/loadablemodule.qbs b/tests/auto/blackbox/testdata/loadablemodule/loadablemodule.qbs
index a5705a865..8023eed36 100644
--- a/tests/auto/blackbox/testdata/loadablemodule/loadablemodule.qbs
+++ b/tests/auto/blackbox/testdata/loadablemodule/loadablemodule.qbs
@@ -4,7 +4,7 @@ Project {
     LoadableModule {
         Depends { name: "cpp" }
         Properties {
-            condition: qbs.targetOS.contains("darwin")
+            condition: qbs.targetOS.includes("darwin")
             bundle.isBundle: false
         }
         name: "CoolPlugIn"
@@ -30,10 +30,10 @@ Project {
         files: ["main.cpp"]
 
         cpp.cxxLanguageVersion: "c++11"
-        cpp.dynamicLibraries: [qbs.targetOS.contains("windows") ? "kernel32" : "dl"]
+        cpp.dynamicLibraries: [qbs.targetOS.includes("windows") ? "kernel32" : "dl"]
 
         Properties {
-            condition: qbs.targetOS.contains("unix") && !qbs.targetOS.contains("darwin")
+            condition: qbs.targetOS.includes("unix") && !qbs.targetOS.includes("darwin")
             cpp.rpaths: [cpp.rpathOrigin]
         }
 
diff --git a/tests/auto/blackbox/testdata/makefile-generator/app.qbs b/tests/auto/blackbox/testdata/makefile-generator/app.qbs
index 367f484cf..fd3fbb91b 100644
--- a/tests/auto/blackbox/testdata/makefile-generator/app.qbs
+++ b/tests/auto/blackbox/testdata/makefile-generator/app.qbs
@@ -13,7 +13,7 @@ CppApplication {
     cpp.cxxLanguageVersion: "c++11"
     cpp.separateDebugInformation: false
     Properties {
-        condition: qbs.targetOS.contains("macos")
+        condition: qbs.targetOS.includes("macos")
         bundle.embedInfoPlist: false
         cpp.minimumMacosVersion: "10.7"
     }
diff --git a/tests/auto/blackbox/testdata/minimumSystemVersion/fakewindows.qbs b/tests/auto/blackbox/testdata/minimumSystemVersion/fakewindows.qbs
index 1a56e0b7e..da836e609 100644
--- a/tests/auto/blackbox/testdata/minimumSystemVersion/fakewindows.qbs
+++ b/tests/auto/blackbox/testdata/minimumSystemVersion/fakewindows.qbs
@@ -4,7 +4,7 @@ import qbs.Utilities
 // (but will still compile and link since we avoid passing a
 // bad value to the linker)
 CppApplication {
-    condition: qbs.targetOS.contains("windows")
+    condition: qbs.targetOS.includes("windows")
     files: ["main.cpp"]
     consoleApplication: true
     cpp.minimumWindowsVersion: "5.3"
diff --git a/tests/auto/blackbox/testdata/minimumSystemVersion/macappstore.qbs b/tests/auto/blackbox/testdata/minimumSystemVersion/macappstore.qbs
index a94b7a80e..26a94e132 100644
--- a/tests/auto/blackbox/testdata/minimumSystemVersion/macappstore.qbs
+++ b/tests/auto/blackbox/testdata/minimumSystemVersion/macappstore.qbs
@@ -8,7 +8,7 @@ CppApplication {
         var result = qbs.targetPlatform === Host.platform();
         if (!result)
             console.info("targetPlatform differs from hostPlatform");
-        return result && qbs.targetOS.contains("macos");
+        return result && qbs.targetOS.includes("macos");
     }
     files: ["main.mm"]
     consoleApplication: true
diff --git a/tests/auto/blackbox/testdata/minimumSystemVersion/specific.qbs b/tests/auto/blackbox/testdata/minimumSystemVersion/specific.qbs
index 4dca16df0..c12c13790 100644
--- a/tests/auto/blackbox/testdata/minimumSystemVersion/specific.qbs
+++ b/tests/auto/blackbox/testdata/minimumSystemVersion/specific.qbs
@@ -10,13 +10,13 @@ CppApplication {
         var result = qbs.targetPlatform === Host.platform();
         if (!result)
             console.info("targetPlatform differs from hostPlatform");
-        return result && qbs.targetOS.contains("windows") || qbs.targetOS.contains("macos");
+        return result && qbs.targetOS.includes("windows") || qbs.targetOS.includes("macos");
     }
-    files: [qbs.targetOS.contains("darwin") ? "main.mm" : "main.cpp"]
+    files: [qbs.targetOS.includes("darwin") ? "main.mm" : "main.cpp"]
     consoleApplication: true
 
     Properties {
-        condition: qbs.targetOS.contains("windows")
+        condition: qbs.targetOS.includes("windows")
         cpp.minimumWindowsVersion: "6.0"
         cpp.defines: [
             "QBS_WINVER=0x600",
@@ -25,7 +25,7 @@ CppApplication {
     }
 
     Properties {
-        condition: qbs.targetOS.contains("macos")
+        condition: qbs.targetOS.includes("macos")
         cpp.frameworks: "Foundation"
         cpp.minimumMacosVersion: "10.7"
     }
diff --git a/tests/auto/blackbox/testdata/minimumSystemVersion/unspecified-forced.qbs b/tests/auto/blackbox/testdata/minimumSystemVersion/unspecified-forced.qbs
index 36756137e..adb61a6d8 100644
--- a/tests/auto/blackbox/testdata/minimumSystemVersion/unspecified-forced.qbs
+++ b/tests/auto/blackbox/testdata/minimumSystemVersion/unspecified-forced.qbs
@@ -11,7 +11,7 @@ CppApplication {
             console.info("targetPlatform differs from hostPlatform");
         return result;
     }
-    files: [qbs.targetOS.contains("darwin") ? "main.mm" : "main.cpp"]
+    files: [qbs.targetOS.includes("darwin") ? "main.mm" : "main.cpp"]
     consoleApplication: true
     cpp.minimumWindowsVersion: undefined
     cpp.minimumMacosVersion: undefined
@@ -19,12 +19,12 @@ CppApplication {
     cpp.minimumAndroidVersion: undefined
 
     Properties {
-        condition: qbs.targetOS.contains("windows")
+        condition: qbs.targetOS.includes("windows")
         cpp.defines: ["TOOLCHAIN_INSTALL_PATH=" + Utilities.cStringQuote(cpp.toolchainInstallPath)]
     }
 
     Properties {
-        condition: qbs.targetOS.contains("darwin")
+        condition: qbs.targetOS.includes("darwin")
         cpp.frameworks: "Foundation"
     }
 }
diff --git a/tests/auto/blackbox/testdata/minimumSystemVersion/unspecified.qbs b/tests/auto/blackbox/testdata/minimumSystemVersion/unspecified.qbs
index 1440925f3..3c6559c39 100644
--- a/tests/auto/blackbox/testdata/minimumSystemVersion/unspecified.qbs
+++ b/tests/auto/blackbox/testdata/minimumSystemVersion/unspecified.qbs
@@ -10,16 +10,16 @@ CppApplication {
             console.info("targetPlatform differs from hostPlatform");
         return result;
     }
-    files: [qbs.targetOS.contains("darwin") ? "main.mm" : "main.cpp"]
+    files: [qbs.targetOS.includes("darwin") ? "main.mm" : "main.cpp"]
     consoleApplication: true
 
     Properties {
-        condition: qbs.targetOS.contains("windows")
+        condition: qbs.targetOS.includes("windows")
         cpp.defines: ["TOOLCHAIN_INSTALL_PATH=" + Utilities.cStringQuote(cpp.toolchainInstallPath)]
     }
 
     Properties {
-        condition: qbs.targetOS.contains("darwin")
+        condition: qbs.targetOS.includes("darwin")
         cpp.frameworks: "Foundation"
     }
 }
diff --git a/tests/auto/blackbox/testdata/no-exported-symbols/no-exported-symbols.qbs b/tests/auto/blackbox/testdata/no-exported-symbols/no-exported-symbols.qbs
index 346a94e21..9aad3d032 100644
--- a/tests/auto/blackbox/testdata/no-exported-symbols/no-exported-symbols.qbs
+++ b/tests/auto/blackbox/testdata/no-exported-symbols/no-exported-symbols.qbs
@@ -12,7 +12,7 @@ Project {
             id: toolchainProbe
             property stringList toolchain: qbs.toolchain
             configure: {
-                if (toolchain.contains("msvc") && !toolchain.contains("clang-cl"))
+                if (toolchain.includes("msvc") && !toolchain.includes("clang-cl"))
                     console.info("compiler is MSVC")
                 else
                     console.info("compiler is not MSVC")
diff --git a/tests/auto/blackbox/testdata/nsis/hello.qbs b/tests/auto/blackbox/testdata/nsis/hello.qbs
index a161a6998..f70f27e2b 100644
--- a/tests/auto/blackbox/testdata/nsis/hello.qbs
+++ b/tests/auto/blackbox/testdata/nsis/hello.qbs
@@ -1,5 +1,5 @@
 NSISSetup {
-    condition: qbs.targetOS.contains("windows")
+    condition: qbs.targetOS.includes("windows")
     name: "Qbs Hello"
     targetName: "qbs-hello-" + qbs.architecture
     files: ["hello.nsi", "hello.bat"]
diff --git a/tests/auto/blackbox/testdata/nsisDependencies/nsisDependencies.qbs b/tests/auto/blackbox/testdata/nsisDependencies/nsisDependencies.qbs
index d8185aabf..a4ce92067 100644
--- a/tests/auto/blackbox/testdata/nsisDependencies/nsisDependencies.qbs
+++ b/tests/auto/blackbox/testdata/nsisDependencies/nsisDependencies.qbs
@@ -2,7 +2,7 @@ import qbs.FileInfo
 import qbs.TextFile
 
 Project {
-    condition: qbs.targetOS.contains("windows")
+    condition: qbs.targetOS.includes("windows")
 
     NSISSetup {
         Depends { name: "app" }
diff --git a/tests/auto/blackbox/testdata/output-redirection/output-redirection.qbs b/tests/auto/blackbox/testdata/output-redirection/output-redirection.qbs
index 37b5b3778..d2474cecf 100644
--- a/tests/auto/blackbox/testdata/output-redirection/output-redirection.qbs
+++ b/tests/auto/blackbox/testdata/output-redirection/output-redirection.qbs
@@ -22,7 +22,7 @@ Product {
         prepare: {
             var binary;
             var prefixArgs;
-            if (Host.os().contains("windows")) {
+            if (Host.os().includes("windows")) {
                 binary = product.qbs.windowsShellPath;
                 prefixArgs = ["/c", "type"];
             } else {
diff --git a/tests/auto/blackbox/testdata/overrideProjectProperties/helper_lib.qbs b/tests/auto/blackbox/testdata/overrideProjectProperties/helper_lib.qbs
index b69dd0da8..c7eab99e2 100644
--- a/tests/auto/blackbox/testdata/overrideProjectProperties/helper_lib.qbs
+++ b/tests/auto/blackbox/testdata/overrideProjectProperties/helper_lib.qbs
@@ -3,7 +3,7 @@ DynamicLibrary {
     files: "helperlib.cpp"
     Depends { name: "cpp" }
     Properties {
-        condition: qbs.targetOS.contains("darwin")
+        condition: qbs.targetOS.includes("darwin")
         bundle.isBundle: false
     }
 }
diff --git a/tests/auto/blackbox/testdata/precompiled-headers-and-redefine/precompiled-headers-and-redefine.qbs b/tests/auto/blackbox/testdata/precompiled-headers-and-redefine/precompiled-headers-and-redefine.qbs
index 55b53a7af..3974b514e 100644
--- a/tests/auto/blackbox/testdata/precompiled-headers-and-redefine/precompiled-headers-and-redefine.qbs
+++ b/tests/auto/blackbox/testdata/precompiled-headers-and-redefine/precompiled-headers-and-redefine.qbs
@@ -8,7 +8,7 @@ CppApplication {
     Group {
         files: ["file.cpp"]
         cpp.defines: ["MYDEF=1"]
-        cpp.cxxFlags: base.concat(qbs.toolchain.contains("clang-cl") ? ["-Wno-clang-cl-pch"] : [])
+        cpp.cxxFlags: base.concat(qbs.toolchain.includes("clang-cl") ? ["-Wno-clang-cl-pch"] : [])
     }
     cpp.treatWarningsAsErrors: true
 
diff --git a/tests/auto/blackbox/testdata/product-dependencies-by-type/product-dependencies-by-type.qbs b/tests/auto/blackbox/testdata/product-dependencies-by-type/product-dependencies-by-type.qbs
index 6772acf27..8e1f291f3 100644
--- a/tests/auto/blackbox/testdata/product-dependencies-by-type/product-dependencies-by-type.qbs
+++ b/tests/auto/blackbox/testdata/product-dependencies-by-type/product-dependencies-by-type.qbs
@@ -91,7 +91,7 @@ Project {
             name: "lib-product"
             files: "main.cpp"
             Properties {
-                condition: qbs.targetOS.contains("darwin")
+                condition: qbs.targetOS.includes("darwin")
                 bundle.isBundle: false
             }
         }
diff --git a/tests/auto/blackbox/testdata/propertyChanges/propertyChanges.qbs b/tests/auto/blackbox/testdata/propertyChanges/propertyChanges.qbs
index 0ae8c1550..29365a887 100644
--- a/tests/auto/blackbox/testdata/propertyChanges/propertyChanges.qbs
+++ b/tests/auto/blackbox/testdata/propertyChanges/propertyChanges.qbs
@@ -27,7 +27,7 @@ Project {
         name: "library"
         files: "lib.cpp"
         Properties {
-            condition: qbs.targetOS.contains("darwin")
+            condition: qbs.targetOS.includes("darwin")
             bundle.isBundle: false
         }
     }
diff --git a/tests/auto/blackbox/testdata/remove-duplicate-libs/remove-duplicate-libs.qbs b/tests/auto/blackbox/testdata/remove-duplicate-libs/remove-duplicate-libs.qbs
index 040e12b3a..d89e47414 100644
--- a/tests/auto/blackbox/testdata/remove-duplicate-libs/remove-duplicate-libs.qbs
+++ b/tests/auto/blackbox/testdata/remove-duplicate-libs/remove-duplicate-libs.qbs
@@ -7,7 +7,7 @@ Project {
     property bool dummy: {
         // most BSD systems (including macOS) use LLVM linker now
         console.info("is bfd linker: "
-                     + (qbs.toolchain.contains("gcc") && !Host.os().contains("bsd")))
+                     + (qbs.toolchain.includes("gcc") && !Host.os().includes("bsd")))
     }
 
     qbsSearchPaths: "."
diff --git a/tests/auto/blackbox/testdata/response-files/response-files.qbs b/tests/auto/blackbox/testdata/response-files/response-files.qbs
index 9158a85fa..c18fcac43 100644
--- a/tests/auto/blackbox/testdata/response-files/response-files.qbs
+++ b/tests/auto/blackbox/testdata/response-files/response-files.qbs
@@ -47,7 +47,7 @@ Project {
         type: ["dynamiclibrary"]
         // clang-cl does not use response file internally, thus linker complains that command is
         // too long. This can be worked around by calling the linker directly
-        cpp.linkerMode: qbs.toolchain.contains("clang-cl") ? "manual" : original
+        cpp.linkerMode: qbs.toolchain.includes("clang-cl") ? "manual" : original
         Depends { name: "cpp" }
         Rule {
             multiplex: true
diff --git a/tests/auto/blackbox/testdata/sanitizer/sanitizer.qbs b/tests/auto/blackbox/testdata/sanitizer/sanitizer.qbs
index 9126a7913..438f3cc39 100644
--- a/tests/auto/blackbox/testdata/sanitizer/sanitizer.qbs
+++ b/tests/auto/blackbox/testdata/sanitizer/sanitizer.qbs
@@ -4,12 +4,12 @@ CppApplication {
     property string sanitizer
 
     property bool supportsSanitizer: {
-        if (qbs.toolchain.contains("mingw"))
+        if (qbs.toolchain.includes("mingw"))
             return false;
         if (sanitizer === "address")
             return Sanitizers.address._supported;
-        if (qbs.toolchain.contains("clang-cl")) {
-            if (cpp.toolchainInstallPath.contains("Microsoft Visual Studio")
+        if (qbs.toolchain.includes("clang-cl")) {
+            if (cpp.toolchainInstallPath.includes("Microsoft Visual Studio")
                     && qbs.architecture === "x86_64") {
                 // 32 bit sanitizer shipped with VS misses the x86_64 libraries
                 return false;
@@ -17,9 +17,9 @@ CppApplication {
             // only these are supported
             return sanitizer === "address" || sanitizer === "undefined";
         }
-        if (!qbs.toolchain.contains("gcc"))
+        if (!qbs.toolchain.includes("gcc"))
             return false;
-        if (qbs.targetOS.contains("ios")) {
+        if (qbs.targetOS.includes("ios")) {
             // thread sanitizer is not supported
             return sanitizer !== "thread";
         }
diff --git a/tests/auto/blackbox/testdata/separate-debug-info/separate-debug-info.qbs b/tests/auto/blackbox/testdata/separate-debug-info/separate-debug-info.qbs
index 48e70f260..9f57b7f01 100644
--- a/tests/auto/blackbox/testdata/separate-debug-info/separate-debug-info.qbs
+++ b/tests/auto/blackbox/testdata/separate-debug-info/separate-debug-info.qbs
@@ -9,9 +9,9 @@ Project {
             id: osProbe
             property stringList targetOS: qbs.targetOS
             configure: {
-                console.info("is windows: " + (targetOS.contains("windows") ? "yes" : "no"));
-                console.info("is macos: " + (targetOS.contains("macos") ? "yes" : "no"));
-                console.info("is darwin: " + (targetOS.contains("darwin") ? "yes" : "no"));
+                console.info("is windows: " + (targetOS.includes("windows") ? "yes" : "no"));
+                console.info("is macos: " + (targetOS.includes("macos") ? "yes" : "no"));
+                console.info("is darwin: " + (targetOS.includes("darwin") ? "yes" : "no"));
             }
         }
     }
@@ -55,7 +55,7 @@ Project {
         files: ["main.cpp"]
         cpp.separateDebugInformation: true
         Properties {
-            condition: qbs.targetOS.contains("darwin")
+            condition: qbs.targetOS.includes("darwin")
             cpp.dsymutilFlags: ["--flat"]
         }
     }
@@ -66,7 +66,7 @@ Project {
         files: ["foo.cpp"]
         cpp.separateDebugInformation: true
         Properties {
-            condition: qbs.targetOS.contains("darwin")
+            condition: qbs.targetOS.includes("darwin")
             cpp.dsymutilFlags: ["--flat"]
         }
     }
@@ -76,7 +76,7 @@ Project {
         files: ["foo.cpp"]
         cpp.separateDebugInformation: true
         Properties {
-            condition: qbs.targetOS.contains("darwin")
+            condition: qbs.targetOS.includes("darwin")
             cpp.dsymutilFlags: ["--flat"]
         }
     }
@@ -94,7 +94,7 @@ Project {
         type: ["dynamiclibrary"]
         files: ["foo.cpp"]
         Properties {
-            condition: qbs.targetOS.contains("darwin")
+            condition: qbs.targetOS.includes("darwin")
             bundle.isBundle: false
         }
         cpp.separateDebugInformation: true
@@ -104,7 +104,7 @@ Project {
         name: "bar4"
         files: ["foo.cpp"]
         Properties {
-            condition: qbs.targetOS.contains("darwin")
+            condition: qbs.targetOS.includes("darwin")
             bundle.isBundle: false
         }
         cpp.separateDebugInformation: true
@@ -115,12 +115,12 @@ Project {
         type: ["application"]
         files: ["main.cpp"]
         Properties {
-            condition: qbs.targetOS.contains("darwin")
+            condition: qbs.targetOS.includes("darwin")
             bundle.isBundle: false
         }
         cpp.separateDebugInformation: true
         Properties {
-            condition: qbs.targetOS.contains("darwin")
+            condition: qbs.targetOS.includes("darwin")
             cpp.dsymutilFlags: ["--flat"]
         }
     }
@@ -130,12 +130,12 @@ Project {
         type: ["dynamiclibrary"]
         files: ["foo.cpp"]
         Properties {
-            condition: qbs.targetOS.contains("darwin")
+            condition: qbs.targetOS.includes("darwin")
             bundle.isBundle: false
         }
         cpp.separateDebugInformation: true
         Properties {
-            condition: qbs.targetOS.contains("darwin")
+            condition: qbs.targetOS.includes("darwin")
             cpp.dsymutilFlags: ["--flat"]
         }
     }
@@ -144,12 +144,12 @@ Project {
         name: "bar5"
         files: ["foo.cpp"]
         Properties {
-            condition: qbs.targetOS.contains("darwin")
+            condition: qbs.targetOS.includes("darwin")
             bundle.isBundle: false
         }
         cpp.separateDebugInformation: true
         Properties {
-            condition: qbs.targetOS.contains("darwin")
+            condition: qbs.targetOS.includes("darwin")
             cpp.dsymutilFlags: ["--flat"]
         }
     }
diff --git a/tests/auto/blackbox/testdata/setup-run-environment/setup-run-environment.qbs b/tests/auto/blackbox/testdata/setup-run-environment/setup-run-environment.qbs
index 02f5ec7b1..b1310c005 100644
--- a/tests/auto/blackbox/testdata/setup-run-environment/setup-run-environment.qbs
+++ b/tests/auto/blackbox/testdata/setup-run-environment/setup-run-environment.qbs
@@ -8,13 +8,13 @@ Project {
 
         files: ["lib1.cpp"]
 
-        install: !qbs.targetOS.contains("darwin")
+        install: !qbs.targetOS.includes("darwin")
         installImportLib: true
         installDir: "lib1"
         importLibInstallDir: installDir
 
         Group {
-        condition: qbs.targetOS.contains("darwin")
+        condition: qbs.targetOS.includes("darwin")
             fileTagsFilter: ["bundle.content"]
             qbs.install: true
             qbs.installSourceBase: destinationDirectory
@@ -27,7 +27,7 @@ Project {
         Depends { name: "lib5" }
 
     Properties {
-            condition: qbs.targetOS.contains("darwin")
+            condition: qbs.targetOS.includes("darwin")
             bundle.isBundle: false
         }
 
@@ -41,7 +41,7 @@ Project {
         files: ["lib3.cpp"]
 
         Properties {
-            condition: qbs.targetOS.contains("darwin")
+            condition: qbs.targetOS.includes("darwin")
             bundle.isBundle: false
         }
 
@@ -58,14 +58,14 @@ Project {
         files: ["lib4.cpp"]
 
         Properties {
-            condition: qbs.targetOS.contains("darwin")
+            condition: qbs.targetOS.includes("darwin")
             bundle.isBundle: false
         }
 
         // Testing shows that clang (8.0) does not find dynamic libraries via
         // the -L<dir> and -l<libname> mechanism unless the name is "lib<libname>.a".
         Properties {
-            condition: Host.os().contains("windows") && qbs.toolchain.contains("clang")
+            condition: Host.os().includes("windows") && qbs.toolchain.includes("clang")
             cpp.dynamicLibraryPrefix: "lib"
             cpp.dynamicLibraryImportSuffix: ".a"
         }
@@ -83,7 +83,7 @@ Project {
         Depends { name: "cpp" }
 
         Properties {
-            condition: qbs.targetOS.contains("darwin")
+            condition: qbs.targetOS.includes("darwin")
             bundle.isBundle: false
         }
 
@@ -108,7 +108,7 @@ Project {
 
         property string fullInstallPrefix: FileInfo.joinPaths(qbs.installRoot, qbs.installPrefix)
         property string lib3FilePath: FileInfo.joinPaths(fullInstallPrefix, "lib3",
-                cpp.dynamicLibraryPrefix + "lib3" + (qbs.targetOS.contains("windows")
+                cpp.dynamicLibraryPrefix + "lib3" + (qbs.targetOS.includes("windows")
                                                      ? cpp.dynamicLibraryImportSuffix
                                                      : cpp.dynamicLibrarySuffix))
         cpp.dynamicLibraries: [lib3FilePath, "lib4"]
@@ -117,7 +117,7 @@ Project {
 
     Probe {
         id: osPrinter
-        property bool isWindows: qbs.targetOS.contains("windows")
+        property bool isWindows: qbs.targetOS.includes("windows")
         configure: {
             console.info("is windows");
             found = true;
diff --git a/tests/auto/blackbox/testdata/smart-relinking/smart-relinking.qbs b/tests/auto/blackbox/testdata/smart-relinking/smart-relinking.qbs
index aac0692a8..29e6c2e17 100644
--- a/tests/auto/blackbox/testdata/smart-relinking/smart-relinking.qbs
+++ b/tests/auto/blackbox/testdata/smart-relinking/smart-relinking.qbs
@@ -5,7 +5,7 @@ Project {
         property stringList toolchain: qbs.toolchain
         property stringList targetOS: qbs.targetOS
         configure: {
-            found = toolchain.contains("gcc") && targetOS.contains("unix");
+            found = toolchain.includes("gcc") && targetOS.includes("unix");
             if (!found)
                 console.info("project disabled");
         }
diff --git a/tests/auto/blackbox/testdata/source-artifact-changes/source-artifact-changes.qbs b/tests/auto/blackbox/testdata/source-artifact-changes/source-artifact-changes.qbs
index de56376df..a53819753 100644
--- a/tests/auto/blackbox/testdata/source-artifact-changes/source-artifact-changes.qbs
+++ b/tests/auto/blackbox/testdata/source-artifact-changes/source-artifact-changes.qbs
@@ -4,7 +4,7 @@ CppApplication {
     consoleApplication: true
 
     Properties {
-        condition: qbs.targetOS.contains("darwin")
+        condition: qbs.targetOS.includes("darwin")
         bundle.embedInfoPlist: false
     }
 
@@ -12,7 +12,7 @@ CppApplication {
         id: toolchainProbe
         property stringList toolchain: qbs.toolchain
         configure: {
-            console.info("is gcc: " + toolchain.contains("gcc"));
+            console.info("is gcc: " + toolchain.includes("gcc"));
             found = true;
         }
     }
diff --git a/tests/auto/blackbox/testdata/static-lib-without-sources/static-lib-without-sources.qbs b/tests/auto/blackbox/testdata/static-lib-without-sources/static-lib-without-sources.qbs
index 32a58c94b..54ec5e230 100644
--- a/tests/auto/blackbox/testdata/static-lib-without-sources/static-lib-without-sources.qbs
+++ b/tests/auto/blackbox/testdata/static-lib-without-sources/static-lib-without-sources.qbs
@@ -6,7 +6,7 @@ StaticLibrary {
     }
 
 Product {
-    type: qbs.targetOS.contains("darwin") ? undefined : ["staticlibrary"]
+    type: qbs.targetOS.includes("darwin") ? undefined : ["staticlibrary"]
     name: "b"
     Depends { name: "cpp" }
     Depends { name: "a" }
diff --git a/tests/auto/blackbox/testdata/symbolLinkMode/symbolLinkMode.qbs b/tests/auto/blackbox/testdata/symbolLinkMode/symbolLinkMode.qbs
index 086a9455b..49bcd9951 100644
--- a/tests/auto/blackbox/testdata/symbolLinkMode/symbolLinkMode.qbs
+++ b/tests/auto/blackbox/testdata/symbolLinkMode/symbolLinkMode.qbs
@@ -16,7 +16,7 @@ Project {
         Depends {
             name: "functions";
             cpp.symbolLinkMode: product.symbolLinkMode
-            cpp.link: !(product.qbs.targetOS.contains("linux") && product.symbolLinkMode === "weak")
+            cpp.link: !(product.qbs.targetOS.includes("linux") && product.symbolLinkMode === "weak")
         }
 
         property string symbolLinkMode: project.lazy ? "lazy" : "weak"
@@ -27,7 +27,7 @@ Project {
         property string installLib: "SHOULD_INSTALL_LIB=" + project.shouldInstallLibrary
         cpp.defines: {
             if (symbolLinkMode === "weak") {
-                return qbs.targetOS.contains("darwin")
+                return qbs.targetOS.includes("darwin")
                         ? ["WEAK_IMPORT=__attribute__((weak_import))", installLib]
                         : ["WEAK_IMPORT=__attribute__((weak))", installLib];
             }
@@ -49,7 +49,7 @@ Project {
         Depends { name: "indirect"; cpp.symbolLinkMode: "reexport" }
 
         Properties {
-            condition: qbs.targetOS.contains("darwin")
+            condition: qbs.targetOS.includes("darwin")
             bundle.isBundle: false
         }
         name: "functions"
@@ -59,7 +59,7 @@ Project {
         cpp.rpaths: [cpp.rpathOrigin]
 
         Properties {
-            condition: qbs.targetOS.contains("darwin")
+            condition: qbs.targetOS.includes("darwin")
             cpp.sonamePrefix: "@rpath"
         }
 
@@ -72,7 +72,7 @@ Project {
 
         Export {
             // let the autotest pass on Linux where reexport is not supported
-            Depends { name: "indirect"; condition: !qbs.targetOS.contains("darwin") }
+            Depends { name: "indirect"; condition: !qbs.targetOS.includes("darwin") }
 
             // on Linux, there is no LC_WEAK_LOAD_DYLIB equivalent (the library is simply omitted
             // from the list of load commands entirely), so use LD_PRELOAD to emulate
@@ -91,7 +91,7 @@ Project {
         Depends { name: "cpp" }
 
         Properties {
-            condition: qbs.targetOS.contains("darwin")
+            condition: qbs.targetOS.includes("darwin")
             bundle.isBundle: false
         }
         name: "indirect"
@@ -100,7 +100,7 @@ Project {
         cpp.minimumMacosVersion: "10.7"
 
         Properties {
-            condition: qbs.targetOS.contains("darwin")
+            condition: qbs.targetOS.includes("darwin")
             // reexport is incompatible with rpath,
             // "ERROR: ld: file not found: @rpath/libindirect.dylib for architecture x86_64"
             cpp.sonamePrefix: qbs.installRoot + "/lib"
diff --git a/tests/auto/blackbox/testdata/variant-suffix/variant-suffix.qbs b/tests/auto/blackbox/testdata/variant-suffix/variant-suffix.qbs
index b6e025e4c..1131e6a2f 100644
--- a/tests/auto/blackbox/testdata/variant-suffix/variant-suffix.qbs
+++ b/tests/auto/blackbox/testdata/variant-suffix/variant-suffix.qbs
@@ -1,8 +1,8 @@
 StaticLibrary {
     name: "l"
 
-    Depends { condition: qbs.targetOS.contains("darwin"); name: "bundle" }
-    Properties { condition: qbs.targetOS.contains("darwin"); bundle.isBundle: false }
+    Depends { condition: qbs.targetOS.includes("darwin"); name: "bundle" }
+    Properties { condition: qbs.targetOS.includes("darwin"); bundle.isBundle: false }
 
     aggregate: false
     property string variantSuffix
@@ -31,8 +31,8 @@ StaticLibrary {
         id: targetOSProbe
         property stringList targetOS: qbs.targetOS
         configure: {
-            console.info("is Windows: " + targetOS.contains("windows"));
-            console.info("is Apple: " + targetOS.contains("darwin"));
+            console.info("is Windows: " + targetOS.includes("windows"));
+            console.info("is Apple: " + targetOS.includes("darwin"));
         }
     }
 }
diff --git a/tests/auto/blackbox/testdata/whole-archive/whole-archive.qbs b/tests/auto/blackbox/testdata/whole-archive/whole-archive.qbs
index f3bcff2cd..ec46938ab 100644
--- a/tests/auto/blackbox/testdata/whole-archive/whole-archive.qbs
+++ b/tests/auto/blackbox/testdata/whole-archive/whole-archive.qbs
@@ -32,7 +32,7 @@ Project {
             property string compilerVersion: cpp.compilerVersion
             property string dummy: product.linkWholeArchive // To force probe re-execution
             configure: {
-                if (!toolchain.contains("msvc")
+                if (!toolchain.includes("msvc")
                         || Utilities.versionCompare(compilerVersion, "19.0.24215.1") >= 0) {
                     console.info("can link whole archives");
                 } else {
diff --git a/tests/auto/language/testdata/additional-product-types.qbs b/tests/auto/language/testdata/additional-product-types.qbs
index 686650f42..f84397da3 100644
--- a/tests/auto/language/testdata/additional-product-types.qbs
+++ b/tests/auto/language/testdata/additional-product-types.qbs
@@ -5,8 +5,8 @@ Product {
     Depends { name: "dummy" }
     Depends { name: "dummy2" }
 
-    property bool hasTag1: type.contains("tag1")
-    property bool hasTag2: type.contains("tag2")
-    property bool hasTag3: type.contains("tag3")
-    property bool hasTag4: type.contains("tag4")
+    property bool hasTag1: type.includes("tag1")
+    property bool hasTag2: type.includes("tag2")
+    property bool hasTag3: type.includes("tag3")
+    property bool hasTag4: type.includes("tag4")
 }
diff --git a/tests/auto/language/testdata/erroneous/properties-item-with-invalid-condition.qbs b/tests/auto/language/testdata/erroneous/properties-item-with-invalid-condition.qbs
index 5b1a41f1b..0b48731ae 100644
--- a/tests/auto/language/testdata/erroneous/properties-item-with-invalid-condition.qbs
+++ b/tests/auto/language/testdata/erroneous/properties-item-with-invalid-condition.qbs
@@ -1,7 +1,7 @@
 Product {
     Depends  { name: "cpp" }
     Properties {
-       condition: cpp.nonexistingproperty.contains("somevalue")
+       condition: cpp.nonexistingproperty.includes("somevalue")
        cpp.defines: ["ABC"]
     }
 }
diff --git a/tests/auto/language/testdata/getNativeSetting.qbs b/tests/auto/language/testdata/getNativeSetting.qbs
index c8126bb10..73af01316 100644
--- a/tests/auto/language/testdata/getNativeSetting.qbs
+++ b/tests/auto/language/testdata/getNativeSetting.qbs
@@ -7,11 +7,11 @@ Project {
     Product {
         name: "p1"
         targetName: {
-            if (Host.os().contains("macos")) {
+            if (Host.os().includes("macos")) {
                 return Utilities.getNativeSetting("/System/Library/CoreServices/SystemVersion.plist", "ProductName");
-            } else if (Host.os().contains("windows")) {
+            } else if (Host.os().includes("windows")) {
                 var productName = Utilities.getNativeSetting("HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Windows NT\\CurrentVersion", "ProductName");
-                if (productName.contains("Windows")) {
+                if (productName.includes("Windows")) {
                     return "Windows";
                 }
                 return undefined;
diff --git a/tests/auto/language/testdata/groupconditions.qbs b/tests/auto/language/testdata/groupconditions.qbs
index b7f383d45..4f55db9cd 100644
--- a/tests/auto/language/testdata/groupconditions.qbs
+++ b/tests/auto/language/testdata/groupconditions.qbs
@@ -43,7 +43,7 @@ Project {
     Product {
         name: "condition_accessing_module_property"
         Group {
-            condition: qbs.targetOS.contains("narf")
+            condition: qbs.targetOS.includes("narf")
             files: ["main.cpp"]
             qbs.install: false
         }
diff --git a/tests/auto/language/testdata/jsextensions.js b/tests/auto/language/testdata/jsextensions.js
index df74a263b..5c5821e86 100644
--- a/tests/auto/language/testdata/jsextensions.js
+++ b/tests/auto/language/testdata/jsextensions.js
@@ -57,9 +57,9 @@ var a = ["one", "two", "three"];
 initTestContext("Array.prototype.contains");
 for (var k in a)
     verify(k !== "contains");
-verify(a.contains("one"));
-verify(a.contains("two"));
-verify(a.contains("three"));
-verify(!a.contains("four"));
+verify(a.includes("one"));
+verify(a.includes("two"));
+verify(a.includes("three"));
+verify(!a.includes("four"));
 
 })()            // END function wrapper
diff --git a/tests/auto/language/testdata/modules/dummy/dummy.qbs b/tests/auto/language/testdata/modules/dummy/dummy.qbs
index b1791ac96..623abc413 100644
--- a/tests/auto/language/testdata/modules/dummy/dummy.qbs
+++ b/tests/auto/language/testdata/modules/dummy/dummy.qbs
@@ -16,7 +16,7 @@ DummyBase {
     property string zort: "zort in dummy"
     property pathList includePaths
     property path somePath
-    property stringList listProp: product.type.contains("blubb") ? ["123"] : ["456"]
+    property stringList listProp: product.type.includes("blubb") ? ["123"] : ["456"]
 
     property bool controllingProp: false
     property stringList listProp2: controllingProp
diff --git a/tests/auto/language/testdata/modules/multiple_backends/backend1.qbs b/tests/auto/language/testdata/modules/multiple_backends/backend1.qbs
index 794c67827..4f78a89ae 100644
--- a/tests/auto/language/testdata/modules/multiple_backends/backend1.qbs
+++ b/tests/auto/language/testdata/modules/multiple_backends/backend1.qbs
@@ -1,4 +1,4 @@
 Module {
-    condition: qbs.targetOS.contains("os1")
+    condition: qbs.targetOS.includes("os1")
     property string prop: "backend 1"
 }
diff --git a/tests/auto/language/testdata/modules/multiple_backends/backend2.qbs b/tests/auto/language/testdata/modules/multiple_backends/backend2.qbs
index 2073c4d0b..e7a44d4c7 100644
--- a/tests/auto/language/testdata/modules/multiple_backends/backend2.qbs
+++ b/tests/auto/language/testdata/modules/multiple_backends/backend2.qbs
@@ -1,5 +1,5 @@
 Module {
-    condition: qbs.targetOS.contains("os2")
+    condition: qbs.targetOS.includes("os2")
     property string prop: "backend 2"
     property string backend2Prop
 }
diff --git a/tests/auto/language/testdata/modules/multiple_backends/backend3.qbs b/tests/auto/language/testdata/modules/multiple_backends/backend3.qbs
index 16228108b..762c12f20 100644
--- a/tests/auto/language/testdata/modules/multiple_backends/backend3.qbs
+++ b/tests/auto/language/testdata/modules/multiple_backends/backend3.qbs
@@ -1,5 +1,5 @@
 Module {
-    condition: qbs.targetOS.contains("os2") && qbs.toolchain.contains("tc")
+    condition: qbs.targetOS.includes("os2") && qbs.toolchain.includes("tc")
     priority: 1
     property string backend3Prop
 }
diff --git a/tests/auto/language/testdata/qbs-properties-in-project-condition.qbs b/tests/auto/language/testdata/qbs-properties-in-project-condition.qbs
index 31f648233..9d27df254 100644
--- a/tests/auto/language/testdata/qbs-properties-in-project-condition.qbs
+++ b/tests/auto/language/testdata/qbs-properties-in-project-condition.qbs
@@ -1,5 +1,5 @@
 Project {
-    condition: qbs.targetOS.contains("whatever")
+    condition: qbs.targetOS.includes("whatever")
 
     Product {
         name: "never reached"
diff --git a/tests/auto/language/testdata/rfc1034identifier.qbs b/tests/auto/language/testdata/rfc1034identifier.qbs
index 4d320f899..e52dcc6b2 100644
--- a/tests/auto/language/testdata/rfc1034identifier.qbs
+++ b/tests/auto/language/testdata/rfc1034identifier.qbs
@@ -3,7 +3,7 @@ import qbs.Utilities
 CppApplication {
     name: Utilities.rfc1034Identifier("this!has@special#characters$uh-oh,Undersc0r3s_Are.Bad")
     Properties {
-        condition: qbs.targetOS.contains("darwin")
+        condition: qbs.targetOS.includes("darwin")
         bundle.infoPlist: { return {"CFBundleIdentifier": "$(PRODUCT_NAME:rfc1034identifier)"}; }
     }
 }
diff --git a/tests/auto/language/tst_language.cpp b/tests/auto/language/tst_language.cpp
index 89bda3ab1..689b3bd7f 100644
--- a/tests/auto/language/tst_language.cpp
+++ b/tests/auto/language/tst_language.cpp
@@ -878,7 +878,7 @@ void TestLanguage::erroneousFiles_data()
             << "The value '.*' of Project.minimumQbsVersion is not a valid version string.";
     QTest::newRow("properties-item-with-invalid-condition")
             << "properties-item-with-invalid-condition.qbs:4:19.*"
-               "cannot read property 'contains' of undefined";
+               "cannot read property 'includes' of undefined";
     QTest::newRow("misused-inherited-property") << "Binding to non-item property";
     QTest::newRow("undeclared_property_in_Properties_item") << "Item 'blubb' is not declared";
     QTest::newRow("same-module-prefix1") << "The name of module 'prefix1' is equal to the first "
author	Christian Kandeler <christian.kandeler@qt.io>	2023-02-15 12:55:02 +0100
committer	Christian Kandeler <christian.kandeler@qt.io>	2023-02-16 13:04:04 +0000
commit	69c3daf42c0ffb9b1f479d37f0caced77dc7fde8 (patch)
tree	39d2abe570b9087f6b6d5d0e18a6d4710a233b34
parent	d60e43c90e9dd0565128e7b3e315ff82115418f7 (diff)