diff options
| author | Jake Petroules <jake.petroules@theqtcompany.com> | 2015-10-28 19:03:44 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@theqtcompany.com> | 2015-11-02 16:44:21 +0000 |
| commit | ce555d558b0b642f0c32fc0ea4cc94ab306735e6 (patch) | |
| tree | 88b8587402a0bbed7e2b7000982866efac7d14d6 /examples | |
| parent | a36012d727bb0f755b349e64af481d315c06bd56 (diff) | |
Deprecate bundle.infoPlistFile and start tagging Info.plist files.
This ensures that artifacts will be appropriately rebuilt if the
product's Info.plist file changes, which is currently ignored.
Change-Id: I3adf7e74bd32f3bb8d3084061dd2793aa02b932c
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/cocoa-application/CocoaApplication.qbs | 2 | ||||
| -rw-r--r-- | examples/cocoa-touch-application/CocoaTouchApplication.qbs | 2 | ||||
| -rw-r--r-- | examples/install-bundle/install-bundle.qbs | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/examples/cocoa-application/CocoaApplication.qbs b/examples/cocoa-application/CocoaApplication.qbs index 95d55e95a..5e9ad9547 100644 --- a/examples/cocoa-application/CocoaApplication.qbs +++ b/examples/cocoa-application/CocoaApplication.qbs @@ -45,6 +45,7 @@ CppApplication { cpp.precompiledHeader: "CocoaApplication/CocoaApplication-Prefix.pch" + // TODO: Remove in 1.6 bundle.infoPlistFile: "CocoaApplication/CocoaApplication-Info.plist" cpp.frameworks: ["Cocoa"] @@ -54,6 +55,7 @@ CppApplication { files: [ "AppDelegate.h", "AppDelegate.m", + //"CocoaApplication-Info.plist", "CocoaApplication-Prefix.pch", "main.m" ] diff --git a/examples/cocoa-touch-application/CocoaTouchApplication.qbs b/examples/cocoa-touch-application/CocoaTouchApplication.qbs index ac5b3dc41..0aa5b31d5 100644 --- a/examples/cocoa-touch-application/CocoaTouchApplication.qbs +++ b/examples/cocoa-touch-application/CocoaTouchApplication.qbs @@ -45,6 +45,7 @@ CppApplication { cpp.precompiledHeader: "CocoaTouchApplication/CocoaTouchApplication-Prefix.pch" + // TODO: Remove in 1.6 bundle.infoPlistFile: "CocoaTouchApplication/CocoaTouchApplication-Info.plist" cpp.frameworks: [ "UIKit", "Foundation", "CoreGraphics" ] @@ -54,6 +55,7 @@ CppApplication { files: [ "AppDelegate.h", "AppDelegate.m", + //"CocoaTouchApplication-Info.plist", "CocoaTouchApplication-Prefix.pch", "Default-568h@2x.png", "Default.png", diff --git a/examples/install-bundle/install-bundle.qbs b/examples/install-bundle/install-bundle.qbs index b13028582..a1b58e3e3 100644 --- a/examples/install-bundle/install-bundle.qbs +++ b/examples/install-bundle/install-bundle.qbs @@ -20,7 +20,7 @@ Project { } Group { - fileTagsFilter: ["infoplist"] + fileTagsFilter: ["aggregate_infoplist"] qbs.install: install && bundle.isBundle && !bundle.embedInfoPlist qbs.installDir: FileInfo.joinPaths(installDir, FileInfo.path(bundle.infoPlistPath)) } @@ -49,7 +49,7 @@ Project { } Group { - fileTagsFilter: ["infoplist"] + fileTagsFilter: ["aggregate_infoplist"] qbs.install: install && bundle.isBundle && !bundle.embedInfoPlist qbs.installDir: FileInfo.joinPaths(installDir, FileInfo.path(bundle.infoPlistPath)) } |