diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2016-06-17 15:09:26 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2016-06-27 16:57:35 +0000 |
| commit | 33e9cd462a6c7b6dc552669361f4321ffdb22ff3 (patch) | |
| tree | 2b81a986c4e6c7f3094a8e5ed959bf2a8fcd057a /share/qbs/modules/java/JavaModule.qbs | |
| parent | 0b0832aaf4cc26bee202207c8cbe64650ee2d2fd (diff) | |
Do the OS X to macOS rename.v1.5.2
[ChangeLog] The "osx" value in qbs.hostOS and qbs.targetOS has been
replaced with "macos". For backwards compatibility, qbs.hostOS will
still contain "osx" in addition to "macos", and an error will be printed
if qbs.targetOS contains "osx" but not "macos". Specifying "macos"
without "osx" is allowed. These checks are subject to be removed in a
future version of qbs, so update your hostOS and targetOS checks
accordingly.
[ChangeLog] cpp.minimumOsxVersion has been deprecated and replaced with
cpp.minimumMacosVersion. cpp.minimumOsxVersion is subject to be removed
in a future version of qbs, so update your projects accordingly.
Change-Id: I479891829dff6eb6750cb2a04e1395f085896f63
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'share/qbs/modules/java/JavaModule.qbs')
| -rw-r--r-- | share/qbs/modules/java/JavaModule.qbs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/share/qbs/modules/java/JavaModule.qbs b/share/qbs/modules/java/JavaModule.qbs index 69845adc9..89ff2857c 100644 --- a/share/qbs/modules/java/JavaModule.qbs +++ b/share/qbs/modules/java/JavaModule.qbs @@ -128,7 +128,7 @@ Module { property path internalClassFilesDir: FileInfo.joinPaths(product.buildDirectory, ".classes") property path runtimeJarPath: { - if (qbs.hostOS.contains("osx") && compilerVersionMajor === 1 && compilerVersionMinor < 7) + if (qbs.hostOS.contains("macos") && compilerVersionMajor === 1 && compilerVersionMinor < 7) return FileInfo.joinPaths(jdkPath, "bundle", "Classes", "classes.jar"); return FileInfo.joinPaths(jdkPath, "jre", "lib", "rt.jar"); } |