feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix qbs build on macOS

Browse Source 
"osx" -> "macos"

Change-Id: Ie25e096b2759cf8f96411560fcca337169d80b08
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
This commit is contained in:
Christian Kandeler
2016-07-28 11:29:06 +02:00
committed by Christian Kandeler
parent ccf040239f
commit b1477190de
24 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/app.qbs
+5 -5
View File
@@ -2,10 +2,10 @@ import qbs
QtcProduct {
Depends { name: "bundle" }
Depends { name: "ib"; condition: qbs.targetOS.contains("osx") }
Depends { name: "ib"; condition: qbs.targetOS.contains("macos") }
Properties {
condition: qbs.targetOS.contains("osx")
condition: qbs.targetOS.contains("macos")
ib.appIconName: "qtcreator"
}
@@ -23,7 +23,7 @@ QtcProduct {
installDir: qtc.ide_bin_path
property bool qtcRunnable: true
cpp.rpaths: qbs.targetOS.contains("osx") ? ["@executable_path/../Frameworks"]
cpp.rpaths: qbs.targetOS.contains("macos") ? ["@executable_path/../Frameworks"]
: ["$ORIGIN/../" + qtc.libDirName + "/qtcreator"]
cpp.includePaths: [
project.sharedSourcesDir + "/qtsingleapplication",
@@ -51,7 +51,7 @@ QtcProduct {
Group {
name: "qtcreator.sh"
condition: qbs.targetOS.contains("unix") && !qbs.targetOS.contains("osx")
condition: qbs.targetOS.contains("unix") && !qbs.targetOS.contains("macos")
files: "../../bin/qtcreator.sh"
qbs.install: true
qbs.installDir: "bin"
@@ -74,7 +74,7 @@ QtcProduct {
}
Group {
condition: qbs.targetOS.contains("osx")
condition: qbs.targetOS.contains("macos")
fileTagsFilter: ["aggregate_infoplist", "pkginfo", "compiled_assetcatalog"]
qbs.install: true
qbs.installSourceBase: product.buildDirectory
src/libs/ssh/ssh.qbs
+2 -2
View File
@@ -69,7 +69,7 @@ Project {
result.push("advapi32", "user32")
else if (qbs.targetOS.contains("linux"))
result.push("rt", "dl");
else if (qbs.targetOS.contains("osx"))
else if (qbs.targetOS.contains("macos"))
result.push("dl");
else if (qbs.targetOS.contains("unix"))
result.push("rt");
@@ -95,7 +95,7 @@ Project {
"BOTAN_HAS_ALLOC_MMAP", "BOTAN_HAS_ENTROPY_SRC_DEV_RANDOM",
"BOTAN_HAS_ENTROPY_SRC_EGD", "BOTAN_HAS_ENTROPY_SRC_FTW",
"BOTAN_HAS_ENTROPY_SRC_UNIX", "BOTAN_HAS_MUTEX_PTHREAD", "BOTAN_HAS_PIPE_UNIXFD_IO")
if (qbs.targetOS.contains("osx"))
if (qbs.targetOS.contains("macos"))
result.push("BOTAN_TARGET_OS_IS_DARWIN", "BOTAN_TARGET_OS_HAS_GETTIMEOFDAY",
"BOTAN_HAS_ALLOC_MMAP", "BOTAN_HAS_ENTROPY_SRC_DEV_RANDOM",
"BOTAN_HAS_ENTROPY_SRC_EGD", "BOTAN_HAS_ENTROPY_SRC_FTW",
src/libs/utils/utils.qbs
+3 -3
View File
@@ -18,7 +18,7 @@ Project {
if (qbs.targetOS.contains("windows")) {
libs.push("user32", "iphlpapi", "ws2_32", "shell32");
} else if (qbs.targetOS.contains("unix")) {
if (!qbs.targetOS.contains("osx"))
if (!qbs.targetOS.contains("macos"))
libs.push("X11");
if (!qbs.targetOS.contains("openbsd"))
libs.push("pthread");
@@ -29,7 +29,7 @@ Project {
cpp.enableExceptions: true
Properties {
condition: qbs.targetOS.contains("osx")
condition: qbs.targetOS.contains("macos")
cpp.frameworks: ["Foundation"]
}
@@ -278,7 +278,7 @@ Project {
Group {
name: "FileUtils_osx"
condition: qbs.targetOS.contains("osx")
condition: qbs.targetOS.contains("macos")
files: [
"fileutils_mac.h", "fileutils_mac.mm",
]
src/plugins/clearcase/clearcase.qbs
+1 -1
View File
@@ -3,7 +3,7 @@ import qbs 1.0
QtcPlugin {
name: "ClearCase"
pluginJsonReplacements: ({"CLEARCASE_DISABLED_STR": (qbs.targetOS.contains("osx") ? "true": "false")})
pluginJsonReplacements: ({"CLEARCASE_DISABLED_STR": (qbs.targetOS.contains("macos") ? "true": "false")})
Depends { name: "Qt.widgets" }
Depends { name: "Utils" }
src/plugins/coreplugin/coreplugin.qbs
+4 -4
View File
@@ -27,7 +27,7 @@ Project {
return ["ole32", "user32"]
}
cpp.frameworks: qbs.targetOS.contains("osx") ? ["AppKit"] : undefined
cpp.frameworks: qbs.targetOS.contains("macos") ? ["AppKit"] : undefined
Group {
name: "General"
@@ -176,7 +176,7 @@ Project {
Group {
name: "ProgressManager_mac"
condition: qbs.targetOS.contains("osx")
condition: qbs.targetOS.contains("macos")
files: [
"progressmanager/progressmanager_mac.mm",
]
@@ -184,7 +184,7 @@ Project {
Group {
name: "ProgressManager_x11"
condition: qbs.targetOS.contains("unix") && !qbs.targetOS.contains("osx")
condition: qbs.targetOS.contains("unix") && !qbs.targetOS.contains("macos")
files: [
"progressmanager/progressmanager_x11.cpp",
]
@@ -288,7 +288,7 @@ Project {
Group {
name: "Locator_mac"
condition: qbs.targetOS.contains("osx")
condition: qbs.targetOS.contains("macos")
files: [
"locator/spotlightlocatorfilter.h",
"locator/spotlightlocatorfilter.mm",
src/plugins/ios/ios.qbs
+1 -1
View File
@@ -11,7 +11,7 @@ QtcPlugin {
Depends { name: "QmlDebug" }
Depends { name: "Qt"; submodules: ["widgets", "xml", "network"] }
cpp.frameworks: base.concat(qbs.targetOS.contains("osx") ? ["CoreFoundation", "IOKit"] : [])
cpp.frameworks: base.concat(qbs.targetOS.contains("macos") ? ["CoreFoundation", "IOKit"] : [])
files: [
"ios.qrc",
src/plugins/projectexplorer/projectexplorer.qbs
+1 -1
View File
@@ -17,7 +17,7 @@ Project {
cpp.defines: base.concat("QTC_CPU=X86Architecture")
Properties {
condition: qbs.targetOS.contains("osx")
condition: qbs.targetOS.contains("macos")
cpp.frameworks: base.concat(["Carbon"])
}
src/plugins/qmldesigner/componentsplugin/componentsplugin.qbs
+1 -1
View File
@@ -4,7 +4,7 @@ QtcProduct {
name: "componentsplugin"
type: ["dynamiclibrary"]
installDir: qtc.ide_plugin_path + '/' + installDirName
property string installDirName: qbs.targetOS.contains("osx") ? "QmlDesigner" : "qmldesigner"
property string installDirName: qbs.targetOS.contains("macos") ? "QmlDesigner" : "qmldesigner"
Depends { name: "Core" }
Depends { name: "QmlDesigner" }
src/plugins/qmldesigner/qtquickplugin/qtquickplugin.qbs
+1 -1
View File
@@ -4,7 +4,7 @@ QtcProduct {
name: "qtquickplugin"
type: ["dynamiclibrary"]
installDir: qtc.ide_plugin_path + '/' + installDirName
property string installDirName: qbs.targetOS.contains("osx") ? "QmlDesigner" : "qmldesigner"
property string installDirName: qbs.targetOS.contains("macos") ? "QmlDesigner" : "qmldesigner"
cpp.defines: base.concat("QTQUICK_LIBRARY")
cpp.includePaths: base.concat("../designercore/include")
src/tools/3rdparty/iossim/iossim.qbs
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ import qbs 1.0
QtcTool {
name: "iossim"
condition: qbs.targetOS.contains("osx")
condition: qbs.targetOS.contains("macos")
Depends { name: "bundle" }
Depends { name: "Qt"; submodules: ["widgets"] }
src/tools/3rdparty/iossim_1_8_2/iossim.qbs
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ import QtcTool
QtcTool {
name: "iossim"
condition: qbs.targetOS.contains("osx")
condition: qbs.targetOS.contains("macos")
Depends { name: "Qt"; submodules: ["widgets"] }
Depends { name: "app_version_header" }
src/tools/clangbackend/clangbackend.qbs
+1 -1
View File
@@ -24,7 +24,7 @@ QtcTool {
cpp.rpaths: base.concat(libclang.llvmLibDir)
Properties {
condition: qbs.targetOS.contains("unix") && !qbs.targetOS.contains("osx")
condition: qbs.targetOS.contains("unix") && !qbs.targetOS.contains("macos")
cpp.linkerFlags: base.concat(["-z", "origin"])
}
}
src/tools/iostool/iostool.qbs
+1 -1
View File
@@ -2,7 +2,7 @@ import qbs 1.0
QtcTool {
name: "iostool"
condition: qbs.targetOS.contains("osx")
condition: qbs.targetOS.contains("macos")
Depends { name: "bundle" }
Depends { name: "Qt.widgets" }
src/tools/qml2puppet/qml2puppet.qbs
+1 -1
View File
@@ -3,7 +3,7 @@ import QtcFunctions
QtcTool {
name: "qml2puppet"
installDir: qbs.targetOS.contains("osx")
installDir: qbs.targetOS.contains("macos")
? qtc.ide_libexec_path + "/qmldesigner" : qtc.ide_libexec_path
Depends { name: "bundle" }
src/tools/sdktool/sdktool.qbs
+1 -1
View File
@@ -7,7 +7,7 @@ QtcTool {
Depends { name: "Utils" }
Depends { name: "app_version_header" }
cpp.defines: base.concat([qbs.targetOS.contains("osx")
cpp.defines: base.concat([qbs.targetOS.contains("macos")
? 'DATA_PATH="."'
: qbs.targetOS.contains("windows") ? 'DATA_PATH="../share/qtcreator"'
: 'DATA_PATH="../../share/qtcreator"'])