diff options
| author | Jake Petroules <jake.petroules@petroules.com> | 2014-12-18 08:43:57 -0800 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2015-01-13 11:57:30 +0100 |
| commit | bfdc2953ecc4a9800c2974d2d63e528c2bdc9b96 (patch) | |
| tree | 011ecf65433d9b7718412861319854ad4ac68fc0 /examples | |
| parent | d350741c4c8522a5f19603654051e073128f2923 (diff) | |
Refactor bundle (CFBundle) support across all of Qbs.
This is the foundation for better bundle support, including static
frameworks, loadable modules ("bundles" i.e. plugins), and custom
bundle types. This also simplifies the difference between bundle and
non-bundle product types from a Qbs user's perspective, and allows more
fine-grained control over the construction of and use of bundles.
This patch also implicitly adds support for static frameworks.
Task-number: QBS-643
Task-number: QBS-642
Change-Id: I65d8d7040603a6ea0ff2c11360234eba6802ad35
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/app-and-lib/app/app.qbs | 1 | ||||
| -rw-r--r-- | examples/cocoa-application/CocoaApplication.qbs | 3 | ||||
| -rw-r--r-- | examples/cocoa-touch-application/CocoaTouchApplication.qbs | 3 | ||||
| -rw-r--r-- | examples/code-generator/code-generator.qbs | 2 |
4 files changed, 3 insertions, 6 deletions
diff --git a/examples/app-and-lib/app/app.qbs b/examples/app-and-lib/app/app.qbs index 7e42e6bf6..83c75beb7 100644 --- a/examples/app-and-lib/app/app.qbs +++ b/examples/app-and-lib/app/app.qbs @@ -39,6 +39,7 @@ import qbs 1.0 Product { type: "application" + consoleApplication: true name : "app-and-lib-app" files : [ "main.cpp" ] Depends { name: "cpp" } diff --git a/examples/cocoa-application/CocoaApplication.qbs b/examples/cocoa-application/CocoaApplication.qbs index 9d7814b35..e81af4a13 100644 --- a/examples/cocoa-application/CocoaApplication.qbs +++ b/examples/cocoa-application/CocoaApplication.qbs @@ -41,12 +41,11 @@ import qbs 1.0 CppApplication { Depends { condition: product.condition; name: "ib" } condition: qbs.targetOS.contains("osx") - type: "applicationbundle" name: "Cocoa Application" cpp.precompiledHeader: "CocoaApplication/CocoaApplication-Prefix.pch" - cpp.infoPlistFile: "CocoaApplication/CocoaApplication-Info.plist" + bundle.infoPlistFile: "CocoaApplication/CocoaApplication-Info.plist" cpp.frameworks: ["Cocoa"] diff --git a/examples/cocoa-touch-application/CocoaTouchApplication.qbs b/examples/cocoa-touch-application/CocoaTouchApplication.qbs index 4ae8b29d2..49064cab5 100644 --- a/examples/cocoa-touch-application/CocoaTouchApplication.qbs +++ b/examples/cocoa-touch-application/CocoaTouchApplication.qbs @@ -41,12 +41,11 @@ import qbs 1.0 CppApplication { Depends { condition: product.condition; name: "ib" } condition: qbs.targetOS.contains("ios") - type: "applicationbundle" name: "Cocoa Touch Application" cpp.precompiledHeader: "CocoaTouchApplication/CocoaTouchApplication-Prefix.pch" - cpp.infoPlistFile: "CocoaTouchApplication/CocoaTouchApplication-Info.plist" + bundle.infoPlistFile: "CocoaTouchApplication/CocoaTouchApplication-Info.plist" cpp.frameworks: [ "UIKit", "Foundation", "CoreGraphics" ] diff --git a/examples/code-generator/code-generator.qbs b/examples/code-generator/code-generator.qbs index c2783421f..ae28c5c1d 100644 --- a/examples/code-generator/code-generator.qbs +++ b/examples/code-generator/code-generator.qbs @@ -40,7 +40,6 @@ Project { // A code generator that outputs a "Hello World" C++ program. Product { name: "hwgen" - type: ["application"] Depends { name: "cpp" } files: ["hwgen.cpp"] } @@ -48,7 +47,6 @@ Project { // Generate and build a hello-world application. Product { name: "hello-world" - type: ["application"] Depends { name: "cpp" } Depends { name: "hwgen" } Rule { |