Simplify installation of applications and libraries

Add "install" and "installDir" convenience properties to our
Application, DynamicLibrary and StaticLibrary items, so users are no
longer required to write groups with file tag filters for the normal
installation case. The installDir property has a suitable default value
for the respective target platform, as does qbs.installPrefix.

[ChangeLog] The Application, DynamicLibrary and StaticLibrary items now
have properties for more convenient installation of target binaries.

Task-number: QBS-229
Change-Id: I9cfa4c02a7c555b0af637257da63967cd62cc119
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

4 files changed, 41 insertions, 104 deletions

diff --git a/tests/auto/blackbox/testdata-apple/apple-dmg/apple-dmg.qbs b/tests/auto/blackbox/testdata-apple/apple-dmg/apple-dmg.qbs
index 3bccebfd0..010e5f7c7 100644
--- a/tests/auto/blackbox/testdata-apple/apple-dmg/apple-dmg.qbs
+++ b/tests/auto/blackbox/testdata-apple/apple-dmg/apple-dmg.qbs
@@ -18,12 +18,7 @@ Project {
         targetName: "My Great App"
         files: ["main.c"]
 
-        Group {
-            fileTagsFilter: ["bundle.content"]
-            qbs.install: true
-            qbs.installDir: "/Applications"
-            qbs.installSourceBase: product.buildDirectory
-        }
+        install: true
     }
 
     AppleDiskImage {
diff --git a/tests/auto/blackbox/testdata-apple/apple-multiconfig/apple-multiconfig.qbs b/tests/auto/blackbox/testdata-apple/apple-multiconfig/apple-multiconfig.qbs
index ae2fcd402..ea67b6e44 100644
--- a/tests/auto/blackbox/testdata-apple/apple-multiconfig/apple-multiconfig.qbs
+++ b/tests/auto/blackbox/testdata-apple/apple-multiconfig/apple-multiconfig.qbs
@@ -17,11 +17,8 @@ Project {
         aggregate: false
         multiplexByQbsProperties: []
 
-        Group {
-            fileTagsFilter: ["bundle.content"]
-            qbs.install: true
-            qbs.installSourceBase: product.buildDirectory
-        }
+        install: true
+        installDir: ""
     }
 
     CppApplication {
@@ -38,11 +35,8 @@ Project {
         qbs.architectures: ["x86_64"]
         qbs.buildVariants: ["release"]
 
-        Group {
-            fileTagsFilter: ["bundle.content"]
-            qbs.install: true
-            qbs.installSourceBase: product.buildDirectory
-        }
+        install: true
+        installDir: ""
     }
 
     DynamicLibrary {
@@ -58,11 +52,8 @@ Project {
         aggregate: false
         multiplexByQbsProperties: []
 
-        Group {
-            fileTagsFilter: ["bundle.content"]
-            qbs.install: true
-            qbs.installSourceBase: product.buildDirectory
-        }
+        install: true
+        installDir: ""
     }
 
     CppApplication {
@@ -74,11 +65,8 @@ Project {
         cpp.rpaths: [cpp.rpathOrigin + "/../../../"]
         cpp.minimumMacosVersion: "10.5"
 
-        Group {
-            fileTagsFilter: ["bundle.content"]
-            qbs.install: true
-            qbs.installSourceBase: product.buildDirectory
-        }
+        install: true
+        installDir: ""
     }
 
     CppApplication {
@@ -91,11 +79,8 @@ Project {
         cpp.minimumMacosVersion: "10.5"
         qbs.architectures: ["x86", "x86_64"]
 
-        Group {
-            fileTagsFilter: ["bundle.content"]
-            qbs.install: true
-            qbs.installSourceBase: product.buildDirectory
-        }
+        install: true
+        installDir: ""
     }
 
     CppApplication {
@@ -109,11 +94,8 @@ Project {
         qbs.architectures: ["x86", "x86_64"]
         qbs.buildVariants: ["debug", "profile"]
 
-        Group {
-            fileTagsFilter: ["bundle.content"]
-            qbs.install: true
-            qbs.installSourceBase: product.buildDirectory
-        }
+        install: true
+        installDir: ""
     }
 
     DynamicLibrary {
@@ -127,11 +109,8 @@ Project {
         qbs.architectures: ["x86", "x86_64"]
         qbs.buildVariants: ["release", "debug", "profile"]
 
-        Group {
-            fileTagsFilter: ["bundle.content"]
-            qbs.install: true
-            qbs.installSourceBase: product.buildDirectory
-        }
+        install: true
+        installDir: ""
     }
 
     DynamicLibrary {
@@ -145,11 +124,8 @@ Project {
         qbs.architectures: ["x86", "x86_64"]
         qbs.buildVariants: ["debug", "profile"]
 
-        Group {
-            fileTagsFilter: ["bundle.content"]
-            qbs.install: true
-            qbs.installSourceBase: product.buildDirectory
-        }
+        install: true
+        installDir: ""
     }
 
     DynamicLibrary {
@@ -162,11 +138,8 @@ Project {
         cpp.defines: ["VARIANT=" + Utilities.cStringQuote(qbs.buildVariant)]
         qbs.architectures: ["x86", "x86_64"]
         qbs.buildVariants: ["debug", "profile"]
-        Group {
-            fileTagsFilter: ["bundle.content"]
-            qbs.install: true
-            qbs.installSourceBase: product.buildDirectory
-        }
+        install: true
+        installDir: ""
     }
     DynamicLibrary {
         Depends { name: "cpp" }
@@ -177,10 +150,7 @@ Project {
         cpp.defines: ["VARIANT=" + Utilities.cStringQuote(qbs.buildVariant)]
         qbs.architectures: ["x86", "x86_64"]
         qbs.buildVariants: ["debug", "profile"]
-        Group {
-            fileTagsFilter: ["bundle.content"]
-            qbs.install: true
-            qbs.installSourceBase: product.buildDirectory
-        }
+        install: true
+        installDir: ""
     }
 }
diff --git a/tests/auto/blackbox/testdata-apple/bundle-structure/bundle-structure.qbs b/tests/auto/blackbox/testdata-apple/bundle-structure/bundle-structure.qbs
index a7c3e20bf..13a205730 100644
--- a/tests/auto/blackbox/testdata-apple/bundle-structure/bundle-structure.qbs
+++ b/tests/auto/blackbox/testdata-apple/bundle-structure/bundle-structure.qbs
@@ -17,11 +17,8 @@ Project {
         bundle.privateHeaders: ["dummy_p.h"]
         bundle.resources: ["resource.txt"]
         files: ["dummy.c"]
-        Group {
-            fileTagsFilter: product.type.concat(project.bundleFileTags)
-            qbs.install: true
-            qbs.installSourceBase: product.buildDirectory
-        }
+        install: true
+        installDir: ""
     }
 
     Application {
@@ -37,11 +34,8 @@ Project {
         bundle.privateHeaders: ["dummy_p.h"]
         bundle.resources: ["resource.txt"]
         files: ["dummy.c"]
-        Group {
-            fileTagsFilter: product.type.concat(project.bundleFileTags)
-            qbs.install: true
-            qbs.installSourceBase: product.buildDirectory
-        }
+        install: true
+        installDir: ""
     }
 
     Application {
@@ -57,11 +51,8 @@ Project {
         bundle.privateHeaders: ["dummy_p.h"]
         bundle.resources: ["resource.txt"]
         files: ["dummy.c"]
-        Group {
-            fileTagsFilter: product.type.concat(project.bundleFileTags)
-            qbs.install: true
-            qbs.installSourceBase: product.buildDirectory
-        }
+        install: true
+        installDir: ""
     }
 
     DynamicLibrary {
@@ -73,11 +64,8 @@ Project {
         bundle.privateHeaders: ["dummy_p.h"]
         bundle.resources: ["resource.txt"]
         files: ["dummy.c"]
-        Group {
-            fileTagsFilter: product.type.concat(project.bundleFileTags)
-            qbs.install: true
-            qbs.installSourceBase: product.buildDirectory
-        }
+        install: true
+        installDir: ""
     }
 
     StaticLibrary {
@@ -89,11 +77,8 @@ Project {
         bundle.privateHeaders: ["dummy_p.h"]
         bundle.resources: ["resource.txt"]
         files: ["dummy.c"]
-        Group {
-            fileTagsFilter: product.type.concat(project.bundleFileTags)
-            qbs.install: true
-            qbs.installSourceBase: product.buildDirectory
-        }
+        install: true
+        installDir: ""
     }
 
     LoadableModule {
@@ -105,11 +90,8 @@ Project {
         bundle.privateHeaders: ["dummy_p.h"]
         bundle.resources: ["resource.txt"]
         files: ["dummy.c"]
-        Group {
-            fileTagsFilter: product.type.concat(project.bundleFileTags)
-            qbs.install: true
-            qbs.installSourceBase: product.buildDirectory
-        }
+        install: true
+        installDir: ""
     }
 
     ApplicationExtension {
@@ -121,11 +103,8 @@ Project {
         bundle.privateHeaders: ["dummy_p.h"]
         bundle.resources: ["resource.txt"]
         files: ["dummy.c"]
-        Group {
-            fileTagsFilter: product.type.concat(project.bundleFileTags)
-            qbs.install: true
-            qbs.installSourceBase: product.buildDirectory
-        }
+        install: true
+        installDir: ""
     }
 
     XPCService {
@@ -137,11 +116,8 @@ Project {
         bundle.privateHeaders: ["dummy_p.h"]
         bundle.resources: ["resource.txt"]
         files: ["dummy.c"]
-        Group {
-            fileTagsFilter: product.type.concat(project.bundleFileTags)
-            qbs.install: true
-            qbs.installSourceBase: product.buildDirectory
-        }
+        install: true
+        installDir: ""
     }
 
     Product {
diff --git a/tests/auto/blackbox/testdata-apple/embedInfoPlist/embedInfoPlist.qbs b/tests/auto/blackbox/testdata-apple/embedInfoPlist/embedInfoPlist.qbs
index c0d77aefd..87f6c1750 100644
--- a/tests/auto/blackbox/testdata-apple/embedInfoPlist/embedInfoPlist.qbs
+++ b/tests/auto/blackbox/testdata-apple/embedInfoPlist/embedInfoPlist.qbs
@@ -13,10 +13,8 @@ Project {
         bundle.infoPlist: ({
             "QBS": "org.qt-project.qbs.testdata.embedInfoPlist"
         })
-        Group {
-            fileTagsFilter: product.type
-            qbs.install: true
-        }
+        install: true
+        installDir: ""
     }
 
     DynamicLibrary {
@@ -30,10 +28,8 @@ Project {
         bundle.infoPlist: ({
             "QBS": "org.qt-project.qbs.testdata.embedInfoPlist.dylib"
         })
-        Group {
-            fileTagsFilter: product.type
-            qbs.install: true
-        }
+        install: true
+        installDir: ""
     }
 
     LoadableModule {