diff options
| author | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2016-06-27 17:23:58 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2016-06-30 15:55:30 +0000 |
| commit | bd609e8e1e1c4c2fdb53a363a51105f2903c4e5b (patch) | |
| tree | ba2483b5a34726129df79fbed0f686f1695c5298 | |
| parent | c8688c079801fc7fdcc468d4076151d79fba7416 (diff) | |
| download | qt-creator-bd609e8e1e1c4c2fdb53a363a51105f2903c4e5b.tar.gz | |
qbs build: Replace deprecated constructs
Change-Id: I5a66a5b805b912a8ee752306d6c39759085e98ad
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | src/app/app.qbs | 4 | ||||
| -rw-r--r-- | src/app/app_version_header.qbs | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/app/app.qbs b/src/app/app.qbs index 5d60404680..db720637db 100644 --- a/src/app/app.qbs +++ b/src/app/app.qbs @@ -4,8 +4,6 @@ QtcProduct { Depends { name: "bundle" } Depends { name: "ib"; condition: qbs.targetOS.contains("osx") } - bundle.infoPlistFile: "Info.plist" // TODO: Remove for qbs 1.6 - Properties { condition: qbs.targetOS.contains("osx") ib.appIconName: "qtcreator" @@ -38,7 +36,7 @@ QtcProduct { Depends { name: "ExtensionSystem" } files: [ - // TODO: Uncomment for qbs 1.6 "Info.plist", + "Info.plist", "main.cpp", "qtcreator.xcassets", "qtcreator.rc", diff --git a/src/app/app_version_header.qbs b/src/app/app_version_header.qbs index 1774fec969..6a6b2540c1 100644 --- a/src/app/app_version_header.qbs +++ b/src/app/app_version_header.qbs @@ -4,12 +4,16 @@ import qbs.TextFile Product { name: "app_version_header" type: "hpp" - files: "app_version.h.in" + + Group { + files: ["app_version.h.in"] + fileTags: ["hpp.in"] + } Depends { name: "qtc" } - Transformer { - inputs: ["app_version.h.in"] + Rule { + inputs: ["hpp.in"] Artifact { filePath: "app/app_version.h" fileTags: "hpp" |