Commit bd609e8e authored by Christian Kandeler's avatar Christian Kandeler

qbs build: Replace deprecated constructs

Change-Id: I5a66a5b805b912a8ee752306d6c39759085e98ad
Reviewed-by: Joerg Bornemann's avatarJoerg Bornemann <joerg.bornemann@qt.io>
parent c8688c07
...@@ -4,8 +4,6 @@ QtcProduct { ...@@ -4,8 +4,6 @@ QtcProduct {
Depends { name: "bundle" } Depends { name: "bundle" }
Depends { name: "ib"; condition: qbs.targetOS.contains("osx") } Depends { name: "ib"; condition: qbs.targetOS.contains("osx") }
bundle.infoPlistFile: "Info.plist" // TODO: Remove for qbs 1.6
Properties { Properties {
condition: qbs.targetOS.contains("osx") condition: qbs.targetOS.contains("osx")
ib.appIconName: "qtcreator" ib.appIconName: "qtcreator"
...@@ -38,7 +36,7 @@ QtcProduct { ...@@ -38,7 +36,7 @@ QtcProduct {
Depends { name: "ExtensionSystem" } Depends { name: "ExtensionSystem" }
files: [ files: [
// TODO: Uncomment for qbs 1.6 "Info.plist", "Info.plist",
"main.cpp", "main.cpp",
"qtcreator.xcassets", "qtcreator.xcassets",
"qtcreator.rc", "qtcreator.rc",
......
...@@ -4,12 +4,16 @@ import qbs.TextFile ...@@ -4,12 +4,16 @@ import qbs.TextFile
Product { Product {
name: "app_version_header" name: "app_version_header"
type: "hpp" type: "hpp"
files: "app_version.h.in"
Group {
files: ["app_version.h.in"]
fileTags: ["hpp.in"]
}
Depends { name: "qtc" } Depends { name: "qtc" }
Transformer { Rule {
inputs: ["app_version.h.in"] inputs: ["hpp.in"]
Artifact { Artifact {
filePath: "app/app_version.h" filePath: "app/app_version.h"
fileTags: "hpp" fileTags: "hpp"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment