forked from qt-creator/qt-creator
Adapt Qbs code to latest changes.
type: application actually does nothing now, as the application type is used for both bundled and unbundled products on Apple platforms. Instead, consoleApplication being set to true influences Qbs not to use a bundle. cpp.infoPlistFile became bundle.infoPlistFile in Qbs 1.4. Change-Id: I6540aa91b2db61ed4cbf2ff30bd46d69db5f9d92 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
This commit is contained in:
@@ -2,7 +2,8 @@ import qbs
|
||||
import qbs.FileInfo
|
||||
|
||||
QtcProduct {
|
||||
type: "application" // no Mac app bundle
|
||||
type: ["application"]
|
||||
consoleApplication: true
|
||||
installDir: project.ide_libexec_path
|
||||
|
||||
cpp.rpaths: {
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
import qbs
|
||||
|
||||
CppApplication {
|
||||
type: "application" // To suppress bundle generation on Mac
|
||||
consoleApplication: true
|
||||
files: "%{CFileName}"
|
||||
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
import qbs
|
||||
|
||||
CppApplication {
|
||||
type: "application" // To suppress bundle generation on Mac
|
||||
consoleApplication: true
|
||||
files: "%{CppFileName}"
|
||||
|
||||
|
||||
3
src/tools/3rdparty/iossim/iossim.qbs
vendored
3
src/tools/3rdparty/iossim/iossim.qbs
vendored
@@ -4,6 +4,7 @@ QtcTool {
|
||||
name: "iossim"
|
||||
condition: qbs.targetOS.contains("osx")
|
||||
|
||||
Depends { name: "bundle" }
|
||||
Depends { name: "Qt"; submodules: ["widgets"] }
|
||||
Depends { name: "app_version_header" }
|
||||
|
||||
@@ -23,7 +24,7 @@ QtcTool {
|
||||
cpp.frameworks: base.concat(["Foundation", "CoreServices", "ApplicationServices", "IOKit",
|
||||
"AppKit"])
|
||||
cpp.frameworkPaths: base.concat("/System/Library/PrivateFrameworks")
|
||||
cpp.infoPlistFile: "Info.plist"
|
||||
bundle.infoPlistFile: "Info.plist"
|
||||
|
||||
installDir: project.ide_libexec_path + "/ios"
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@ QtcTool {
|
||||
name: "iostool"
|
||||
condition: qbs.targetOS.contains("osx")
|
||||
|
||||
Depends { name: "bundle" }
|
||||
Depends { name: "Qt.widgets" }
|
||||
Depends { name: "Qt.xml" }
|
||||
Depends { name: "Qt.network" }
|
||||
@@ -17,7 +18,7 @@ QtcTool {
|
||||
cpp.frameworks: base.concat(["CoreFoundation", "CoreServices", "IOKit", "Security",
|
||||
"SystemConfiguration"])
|
||||
cpp.dynamicLibraries: base.concat(["ssl", "bz2"])
|
||||
cpp.infoPlistFile: "Info.plist"
|
||||
bundle.infoPlistFile: "Info.plist"
|
||||
|
||||
installDir: project.ide_libexec_path + "/ios"
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@ import qbs
|
||||
|
||||
CppApplication {
|
||||
name: "valgrind-fake"
|
||||
type: "application"
|
||||
consoleApplication: true
|
||||
destinationDirectory: project.ide_bin_path
|
||||
Depends { name: "Qt"; submodules: ["network", "xml"]; }
|
||||
files: [
|
||||
|
||||
Reference in New Issue
Block a user