diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2023-02-17 17:03:21 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2023-02-20 09:03:31 +0000 |
| commit | 9937e3b3548fd3d6caf573723ecacd2ad925f1a1 (patch) | |
| tree | d55beea56ce29d893f70f72234568b7a1afa6dae /share/qbs/modules/java/JavaModule.qbs | |
| parent | d8523b5b2568a14fc9dc5fb4de09895c6ca02a01 (diff) | |
| download | qbs-9937e3b3548fd3d6caf573723ecacd2ad925f1a1.tar.gz | |
Prefer built-in JS function in modules
contains -> includes
Change-Id: Id893c2ea0659d9bded4f5cec1a3160ccd802118b
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Diffstat (limited to 'share/qbs/modules/java/JavaModule.qbs')
| -rw-r--r-- | share/qbs/modules/java/JavaModule.qbs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/share/qbs/modules/java/JavaModule.qbs b/share/qbs/modules/java/JavaModule.qbs index d4d7c4492..343b2f4ba 100644 --- a/share/qbs/modules/java/JavaModule.qbs +++ b/share/qbs/modules/java/JavaModule.qbs @@ -123,10 +123,10 @@ Module { } else { paths.push(FileInfo.joinPaths(jdkPath, "include")); - var hostOS = Host.os().contains("windows") ? Host.os().concat(["win32"]) : Host.os(); + var hostOS = Host.os().includes("windows") ? Host.os().concat(["win32"]) : Host.os(); var platforms = ["win32", "darwin", "linux", "bsd", "solaris"]; for (var i = 0; i < platforms.length; ++i) { - if (hostOS.contains(platforms[i])) { + if (hostOS.includes(platforms[i])) { // Corresponds to JDK_INCLUDE_SUBDIR in the JDK Makefiles paths.push(FileInfo.joinPaths(jdkPath, "include", platforms[i])); break; @@ -141,7 +141,7 @@ Module { property path classFilesDir: FileInfo.joinPaths(product.buildDirectory, "classes") property path internalClassFilesDir: FileInfo.joinPaths(product.buildDirectory, ".classes") - property bool isAppleJava: Host.os().contains("darwin") + property bool isAppleJava: Host.os().includes("darwin") && (compilerVersionMajor < 1 || (compilerVersionMajor === 1 && compilerVersionMinor < 7)) |