1 files changed, 17 insertions, 31 deletions
diff --git a/examples/install-bundle/install-bundle.qbs b/examples/install-bundle/install-bundle.qbs
index a1b58e3e3..5659f3c72 100644
--- a/examples/install-bundle/install-bundle.qbs
+++ b/examples/install-bundle/install-bundle.qbs
@@ -4,31 +4,25 @@ import qbs.FileInfo
 Project {
     CppApplication {
         Depends { name: "coreutils" }
+        Depends { name: "ib"; condition: qbs.targetOS.contains("darwin") }
         Depends { name: "Qt"; submodules: ["core", "gui", "widgets"] }
 
         name: "window"
         targetName: bundle.isBundle ? "Window" : "window"
-        files: ["main.cpp"]
-
-        property bool install: true
-        property string installDir: bundle.isBundle ? "Applications" : (qbs.targetOS.contains("windows") ? "" : "bin")
-
-        Group {
-            fileTagsFilter: ["application"]
-            qbs.install: install
-            qbs.installDir: bundle.isBundle ? FileInfo.joinPaths(installDir, FileInfo.path(bundle.executablePath)) : installDir
-        }
+        files: [
+            "main.cpp",
+            "assetcatalog1.xcassets",
+            "assetcatalog2.xcassets",
+            "white.iconset",
+            "MainMenu.xib",
+            "Storyboard.storyboard"
+        ]
 
         Group {
-            fileTagsFilter: ["aggregate_infoplist"]
-            qbs.install: install && bundle.isBundle && !bundle.embedInfoPlist
-            qbs.installDir: FileInfo.joinPaths(installDir, FileInfo.path(bundle.infoPlistPath))
-        }
-
-        Group {
-            fileTagsFilter: ["pkginfo"]
-            qbs.install: install && bundle.isBundle
-            qbs.installDir: FileInfo.joinPaths(installDir, FileInfo.path(bundle.pkgInfoPath))
+            fileTagsFilter: bundle.isBundle ? ["bundle.content"] : ["application"]
+            qbs.install: true
+            qbs.installDir: bundle.isBundle ? "Applications" : (qbs.targetOS.contains("windows") ? "" : "bin")
+            qbs.installSourceBase: product.buildDirectory
         }
     }
 
@@ -39,19 +33,11 @@ Project {
         targetName: bundle.isBundle ? "CoreUtils" : "coreutils"
         files: ["coreutils.cpp", "coreutils.h"]
 
-        property bool install: true
-        property string installDir: bundle.isBundle ? "Library/Frameworks" : (qbs.targetOS.contains("windows") ? "" : "lib")
-
-        Group {
-            fileTagsFilter: ["dynamiclibrary", "dynamiclibrary_symlink", "dynamiclibrary_import"]
-            qbs.install: install
-            qbs.installDir: bundle.isBundle ? FileInfo.joinPaths(installDir, FileInfo.path(bundle.executablePath)) : installDir
-        }
-
         Group {
-            fileTagsFilter: ["aggregate_infoplist"]
-            qbs.install: install && bundle.isBundle && !bundle.embedInfoPlist
-            qbs.installDir: FileInfo.joinPaths(installDir, FileInfo.path(bundle.infoPlistPath))
+            fileTagsFilter: bundle.isBundle ? ["bundle.content"] : ["dynamiclibrary", "dynamiclibrary_symlink", "dynamiclibrary_import"]
+            qbs.install: true
+            qbs.installDir: bundle.isBundle ? "Library/Frameworks" : (qbs.targetOS.contains("windows") ? "" : "lib")
+            qbs.installSourceBase: product.buildDirectory
         }
     }
 }