diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2023-02-17 17:08:46 +0100 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2023-02-20 09:07:31 +0000 |
commit | 385dbb2ad143bbd0c32f21d6e3cbbd4d116ebcff (patch) | |
tree | 7afe4c712e912436716240792bb8877412dad28b | |
parent | 9937e3b3548fd3d6caf573723ecacd2ad925f1a1 (diff) | |
download | qbs-385dbb2ad143bbd0c32f21d6e3cbbd4d116ebcff.tar.gz |
Docs: Do not use .contains()
Amends e3522f42773cfbb9a980e859c906457b3571fa1f.
Change-Id: If51576f080ee5c01eeae493934cf646403594965
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
-rw-r--r-- | doc/howtos.qdoc | 18 | ||||
-rw-r--r-- | doc/qbs.qdoc | 4 | ||||
-rw-r--r-- | doc/reference/items/language/group.qdoc | 8 | ||||
-rw-r--r-- | doc/reference/items/language/module.qdoc | 2 | ||||
-rw-r--r-- | doc/reference/items/language/properties.qdoc | 18 | ||||
-rw-r--r-- | doc/reference/modules/cpp-module.qdoc | 4 | ||||
-rw-r--r-- | doc/reference/modules/qbs-module.qdoc | 20 |
7 files changed, 37 insertions, 37 deletions
diff --git a/doc/howtos.qdoc b/doc/howtos.qdoc index e21a2588d..268bee7c0 100644 --- a/doc/howtos.qdoc +++ b/doc/howtos.qdoc @@ -390,19 +390,19 @@ Depends { name: "cpp" } cpp.includePaths: ["/somewhere/include"] Properties { - condition: qbs.targetOS.contains("android") + condition: qbs.targetOS.includes("android") cpp.dynamicLibraries: ["/somewhere/android/" + Android.ndk.abi + "/lib1.so"] } Properties { - condition: qbs.targetOS.contains("macos") + condition: qbs.targetOS.includes("macos") cpp.dynamicLibraries: ["/somewhere/macos/lib1.dylib"] } Properties { - condition: qbs.targetOS.contains("windows") && qbs.architecture === "x86" + condition: qbs.targetOS.includes("windows") && qbs.architecture === "x86" cpp.dynamicLibraries: ["/somewhere/windows_x86/lib1.lib"] } Properties { - condition: qbs.targetOS.contains("windows") && qbs.architecture === "x86_64" + condition: qbs.targetOS.includes("windows") && qbs.architecture === "x86_64" cpp.dynamicLibraries: ["/somewhere/windows_x86_64/lib1.lib"] } } @@ -532,7 +532,7 @@ CppApplication { // ... - readonly property bool isMsvc: qbs.toolchain.contains("msvc") + readonly property bool isMsvc: qbs.toolchain.includes("msvc") cpp.commonCompilerFlags: isMsvc ? "/wd4996" : "-Wno-deprecated-declarations" } @@ -755,7 +755,7 @@ \c qbs.targetOS has the wrong value: \code - readonly property bool unix: qbs.targetOS.contains("unix") + readonly property bool unix: qbs.targetOS.includes("unix") \endcode To find out the value of \c qbs.targetOS, use \c {console.info()}: @@ -763,7 +763,7 @@ \code readonly property bool unix: { console.info("qbs.targetOS: " + qbs.targetOS) - return qbs.targetOS.contains("unix") + return qbs.targetOS.includes("unix") } \endcode @@ -771,9 +771,9 @@ be useful if the property contains invalid or unsupported value: \code readonly property bool unix: { - if (qbs.targetOS.contains("darwin")) + if (qbs.targetOS.includes("darwin")) throw "Apple platforms are not supported"; - return qbs.targetOS.contains("unix") + return qbs.targetOS.includes("unix") } \endcode diff --git a/doc/qbs.qdoc b/doc/qbs.qdoc index fc28f6a66..45d6dfc91 100644 --- a/doc/qbs.qdoc +++ b/doc/qbs.qdoc @@ -1257,7 +1257,7 @@ This is how you do it: \code Group { - condition: qbs.targetOS.contains("windows") + condition: qbs.targetOS.includes("windows") files: [ "harddiskdeleter_win.cpp", "blowupmonitor_win.cpp", @@ -1265,7 +1265,7 @@ ] } Group { - condition: qbs.targetOS.contains("linux") + condition: qbs.targetOS.includes("linux") files: [ "harddiskdeleter_linux.cpp", "blowupmonitor_linux.cpp", diff --git a/doc/reference/items/language/group.qdoc b/doc/reference/items/language/group.qdoc index a1676676e..c9b6dd1cf 100644 --- a/doc/reference/items/language/group.qdoc +++ b/doc/reference/items/language/group.qdoc @@ -48,21 +48,21 @@ } Group { name: "Windows files" - condition: qbs.targetOS.contains("windows") + condition: qbs.targetOS.includes("windows") files: "myclass_win_impl.cpp" } Group { name: "Unix files" - condition: qbs.targetOS.contains("unix") + condition: qbs.targetOS.includes("unix") files: "unixhelper.cpp" Group { name: "Linux files" - condition: qbs.targetOS.contains("linux") + condition: qbs.targetOS.includes("linux") files: "myclass_linux_impl.cpp" } Group { name: "FreeBSD files" - condition: qbs.targetOS.contains("freebsd") + condition: qbs.targetOS.includes("freebsd") files: "myclass_freebsd_impl.cpp" } } diff --git a/doc/reference/items/language/module.qdoc b/doc/reference/items/language/module.qdoc index f630f60fd..172939537 100644 --- a/doc/reference/items/language/module.qdoc +++ b/doc/reference/items/language/module.qdoc @@ -169,7 +169,7 @@ \qml Module { property bool featureEnabled: - (product.type.contains("application")) ? true : false + (product.type.includes("application")) ? true : false } \endqml diff --git a/doc/reference/items/language/properties.qdoc b/doc/reference/items/language/properties.qdoc index 6e235d927..49da1dee1 100644 --- a/doc/reference/items/language/properties.qdoc +++ b/doc/reference/items/language/properties.qdoc @@ -44,7 +44,7 @@ \code Product { Properties { - condition: qbs.targetOS.contains("windows") + condition: qbs.targetOS.includes("windows") cpp.defines: ["ON_WINDOWS"] cpp.includePaths: ["extraWindowsIncludes"] } @@ -57,12 +57,12 @@ \code Product { Properties { - condition: qbs.targetOS.contains("windows") + condition: qbs.targetOS.includes("windows") cpp.defines: ["ON_WINDOWS"] cpp.includePaths: ["myWindowsIncludes"] } Properties { - condition: qbs.targetOS.contains("linux") + condition: qbs.targetOS.includes("linux") cpp.defines: ["ON_LINUX"] cpp.includePaths: ["myLinuxIncludes"] } @@ -73,16 +73,16 @@ \code Product { cpp.defines: { - if (qbs.targetOS.contains("windows")) + if (qbs.targetOS.includes("windows")) return ["ON_WINDOWS"]; - if (qbs.targetOS.contains("linux")) + if (qbs.targetOS.includes("linux")) return ["ON_LINUX"]; return ["ON_UNKNOWN_PLATFORM"]; } cpp.includePaths: { - if (qbs.targetOS.contains("windows")) + if (qbs.targetOS.includes("windows")) return ["myWindowsIncludes"]; - if (qbs.targetOS.contains("linux")) + if (qbs.targetOS.includes("linux")) return ["myLinuxIncludes"]; return base; } @@ -94,11 +94,11 @@ \code Product { Properties { - condition: qbs.targetOS.contains("windows") + condition: qbs.targetOS.includes("windows") cpp.defines: outer.concat("ON_WINDOWS") // === ["FOO", "ON_WINDOWS"] } Properties { - condition: qbs.targetOS.contains("linux") + condition: qbs.targetOS.includes("linux") cpp.defines: ["ON_LINUX"] // === ["ON_LINUX"] } cpp.defines: ["FOO"] diff --git a/doc/reference/modules/cpp-module.qdoc b/doc/reference/modules/cpp-module.qdoc index 540516135..f0b6de063 100644 --- a/doc/reference/modules/cpp-module.qdoc +++ b/doc/reference/modules/cpp-module.qdoc @@ -1409,11 +1409,11 @@ \code Properties { - condition: qbs.toolchain.contains("gcc") + condition: qbs.toolchain.includes("gcc") cpp.linkerVariant: "gold" } Properties { - condition: qbs.toolchain.contains("clang-cl") + condition: qbs.toolchain.includes("clang-cl") cpp.linkerVariant: "lld" } \endcode diff --git a/doc/reference/modules/qbs-module.qdoc b/doc/reference/modules/qbs-module.qdoc index e0d0ec457..7fc1479d4 100644 --- a/doc/reference/modules/qbs-module.qdoc +++ b/doc/reference/modules/qbs-module.qdoc @@ -55,7 +55,7 @@ name: "Runtime resources" files: "*.qml" qbs.install: true - qbs.installDir: condition: qbs.targetOS.contains("unix") + qbs.installDir: condition: qbs.targetOS.includes("unix") ? "share/myapp" : "resources" } Group { @@ -64,7 +64,7 @@ qbs.install: true qbs.installDir: "bin" } - qbs.installPrefix: condition: qbs.targetOS.contains("unix") + qbs.installPrefix: condition: qbs.targetOS.includes("unix") ? "usr/local" : "MyApp" } \endcode @@ -477,12 +477,12 @@ \code Properties { // flags for GCC - condition: qbs.toolchain.contains("gcc") + condition: qbs.toolchain.includes("gcc") cpp.commonCompilerFlags: ... } Properties { // flags for MSVC - condition: qbs.toolchain.contains("msvc") + condition: qbs.toolchain.includes("msvc") cpp.commonCompilerFlags: ... } \endcode @@ -498,7 +498,7 @@ use: \code - qbs.toolchain.contains("gcc") + qbs.toolchain.includes("gcc") \endcode since XCode, GCC and Clang belong to the \c "gcc" family. @@ -645,17 +645,17 @@ \code Group { // Includes all Unix-like platforms, such as: Linux, BSD, Apple platforms and others. - condition: qbs.targetOS.contains("unix") + condition: qbs.targetOS.includes("unix") files: ... } Group { // Includes all Apple platforms, such as macOS, iOS, and iOS Simulator. - condition: qbs.targetOS.contains("darwin") + condition: qbs.targetOS.includes("darwin") files: ... } Group { // Includes only macOS - condition: qbs.targetOS.contains("macos") + condition: qbs.targetOS.includes("macos") files: ... } \endcode @@ -668,7 +668,7 @@ use \code - qbs.targetOS.contains("darwin") + qbs.targetOS.includes("darwin") \endcode @@ -681,7 +681,7 @@ versus \code - qbs.targetOS.contains("linux") && !qbs.targetOS.contains("android") + qbs.targetOS.includes("linux") && !qbs.targetOS.includes("android") \endcode For the complete list of possible values, see |