Skip to content
Snippets Groups Projects
Commit 46910b46 authored by Jake Petroules's avatar Jake Petroules
Browse files

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: default avatarChristian Kandeler <christian.kandeler@theqtcompany.com>
parent e1d407b4
Branches
Tags
No related merge requests found
...@@ -2,7 +2,8 @@ import qbs ...@@ -2,7 +2,8 @@ import qbs
import qbs.FileInfo import qbs.FileInfo
QtcProduct { QtcProduct {
type: "application" // no Mac app bundle type: ["application"]
consoleApplication: true
installDir: project.ide_libexec_path installDir: project.ide_libexec_path
cpp.rpaths: { cpp.rpaths: {
......
import qbs import qbs
CppApplication { CppApplication {
type: "application" // To suppress bundle generation on Mac
consoleApplication: true consoleApplication: true
files: "%{CFileName}" files: "%{CFileName}"
......
import qbs import qbs
CppApplication { CppApplication {
type: "application" // To suppress bundle generation on Mac
consoleApplication: true consoleApplication: true
files: "%{CppFileName}" files: "%{CppFileName}"
......
...@@ -4,6 +4,7 @@ QtcTool { ...@@ -4,6 +4,7 @@ QtcTool {
name: "iossim" name: "iossim"
condition: qbs.targetOS.contains("osx") condition: qbs.targetOS.contains("osx")
Depends { name: "bundle" }
Depends { name: "Qt"; submodules: ["widgets"] } Depends { name: "Qt"; submodules: ["widgets"] }
Depends { name: "app_version_header" } Depends { name: "app_version_header" }
...@@ -23,7 +24,7 @@ QtcTool { ...@@ -23,7 +24,7 @@ QtcTool {
cpp.frameworks: base.concat(["Foundation", "CoreServices", "ApplicationServices", "IOKit", cpp.frameworks: base.concat(["Foundation", "CoreServices", "ApplicationServices", "IOKit",
"AppKit"]) "AppKit"])
cpp.frameworkPaths: base.concat("/System/Library/PrivateFrameworks") cpp.frameworkPaths: base.concat("/System/Library/PrivateFrameworks")
cpp.infoPlistFile: "Info.plist" bundle.infoPlistFile: "Info.plist"
installDir: project.ide_libexec_path + "/ios" installDir: project.ide_libexec_path + "/ios"
} }
...@@ -4,6 +4,7 @@ QtcTool { ...@@ -4,6 +4,7 @@ QtcTool {
name: "iostool" name: "iostool"
condition: qbs.targetOS.contains("osx") condition: qbs.targetOS.contains("osx")
Depends { name: "bundle" }
Depends { name: "Qt.widgets" } Depends { name: "Qt.widgets" }
Depends { name: "Qt.xml" } Depends { name: "Qt.xml" }
Depends { name: "Qt.network" } Depends { name: "Qt.network" }
...@@ -17,7 +18,7 @@ QtcTool { ...@@ -17,7 +18,7 @@ QtcTool {
cpp.frameworks: base.concat(["CoreFoundation", "CoreServices", "IOKit", "Security", cpp.frameworks: base.concat(["CoreFoundation", "CoreServices", "IOKit", "Security",
"SystemConfiguration"]) "SystemConfiguration"])
cpp.dynamicLibraries: base.concat(["ssl", "bz2"]) cpp.dynamicLibraries: base.concat(["ssl", "bz2"])
cpp.infoPlistFile: "Info.plist" bundle.infoPlistFile: "Info.plist"
installDir: project.ide_libexec_path + "/ios" installDir: project.ide_libexec_path + "/ios"
} }
...@@ -2,7 +2,7 @@ import qbs ...@@ -2,7 +2,7 @@ import qbs
CppApplication { CppApplication {
name: "valgrind-fake" name: "valgrind-fake"
type: "application" consoleApplication: true
destinationDirectory: project.ide_bin_path destinationDirectory: project.ide_bin_path
Depends { name: "Qt"; submodules: ["network", "xml"]; } Depends { name: "Qt"; submodules: ["network", "xml"]; }
files: [ files: [
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment