diff --git a/src/app/app.qbs b/src/app/app.qbs
index 5d60404680a..db720637dba 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 1774fec969d..6a6b2540c19 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"