Adapt qbs project files to new installation approach.

This need a qbs build >= commit 5cdf94de to work properly.

Change-Id: If86aedf9e3f9d01ad1202e03221e49698d517666
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

13 files changed, 76 insertions, 139 deletions

diff --git a/lib/qtcreator/qtcomponents/qtcomponents.qbs b/lib/qtcreator/qtcomponents/qtcomponents.qbs
index b7f81c62cd..02feb04119 100644
--- a/lib/qtcreator/qtcomponents/qtcomponents.qbs
+++ b/lib/qtcreator/qtcomponents/qtcomponents.qbs
@@ -1,90 +1,16 @@
 import qbs.base 1.0
 
 Product {
-    type: ["installed_content"]
     name: "QtComponents"
 
     Group {
+        qbs.install: true
         qbs.installDir: "lib/qtcreator/qtcomponents/"
-        fileTags: ["install"]
         files: [
-            "Button.qml",
-            "ButtonRow.qml",
-            "CheckBox.qml",
-            "ChoiceList.qml",
-            "ContextMenu.qml",
-            "Dial.qml",
-            "Frame.qml",
-            "GroupBox.qml",
-            "Menu.qml",
-            "MenuItem.qml",
-            "ProgressBar.qml",
-            "RadioButton.qml",
-            "ScrollArea.qml",
-            "ScrollBar.qml",
-            "Slider.qml",
-            "SpinBox.qml",
-            "SplitterRow.qml",
-            "Switch.qml",
-            "Tab.qml",
-            "TabBar.qml",
-            "TabFrame.qml",
-            "TableColumn.qml",
-            "TableView.qml",
-            "TextArea.qml",
-            "TextField.qml",
-            "ToolBar.qml",
-            "ToolButton.qml",
+            "*.qml",
             "qmldir",
-        ]
-    }
-
-    Group {
-        qbs.installDir: "lib/qtcreator/qtcomponents/custom"
-        fileTags: ["install"]
-        prefix: "custom/"
-        files: [
-            "BasicButton.qml",
-            "Button.qml",
-            "ButtonColumn.qml",
-            "ButtonGroup.js",
-            "ButtonRow.qml",
-            "CheckBox.qml",
-            "ChoiceList.qml",
-            "GroupBox.qml",
-            "ProgressBar.qml",
-            "Slider.qml",
-            "SpinBox.qml",
-            "SplitterRow.qml",
-            "TextField.qml",
-            "components.pro",
-            "qmldir",
-        ]
-    }
-
-    Group {
-        qbs.installDir: "lib/qtcreator/qtcomponents/custom/behaviors"
-        fileTags: ["install"]
-        files: [
-            "custom/behaviors/ButtonBehavior.qml",
-            "custom/behaviors/ModalPopupBehavior.qml",
-        ]
-    }
-
-    Group {
-        qbs.installDir: "lib/qtcreator/qtcomponents/custom/private"
-        fileTags: ["install"]
-        files: [
-            "custom/private/ChoiceListPopup.qml",
-        ]
-    }
-
-    Group {
-        qbs.installDir: "lib/qtcreator/qtcomponents/images"
-        fileTags: ["install"]
-        files: [
-            "images/folder_new.png",
+            "custom",
+            "images"
         ]
     }
 }
-
diff --git a/qbs/pluginspec/pluginspec.qbs b/qbs/pluginspec/pluginspec.qbs
index dea785fe29..9e7861f016 100644
--- a/qbs/pluginspec/pluginspec.qbs
+++ b/qbs/pluginspec/pluginspec.qbs
@@ -9,27 +9,14 @@ Module {
     property int ide_version_minor: project.ide_version_minor
     property int ide_version_release: project.ide_version_release
     property string qtcreator_version: ide_version_major + '.' + ide_version_minor + '.' + ide_version_release
-    property string destdir: product.destination
-
     property var pluginspecreplacements: product.pluginspecreplacements
 
-
-    FileTagger {
-        pattern: "*.in"
-        fileTags: ["pluginSpecIn"]
-    }
-
     Rule {
         inputs: ["pluginSpecIn"]
 
         Artifact {
             fileTags: ["pluginSpec"]
-            fileName: {
-                var destdir = input.modules.pluginspec.destdir;
-                if (!destdir.match(/\/$/))
-                    destdir += "/";
-                return destdir + input.fileName.replace(/\.[^\.]*$/,'');
-            }
+            fileName: input.fileName.replace(/\.[^\.]*$/,'')
         }
 
         prepare: {
diff --git a/qtcreator.qbs b/qtcreator.qbs
index 58c7978f38..4413f66cae 100644
--- a/qtcreator.qbs
+++ b/qtcreator.qbs
@@ -136,10 +136,8 @@ Project {
         }
     }
 
-    Product {
+    Application {
         name: "qtcreator"
-        type: ["application", "installed_content"]
-        destination: "bin"
         consoleApplication: qbs.debugInformation
 
         cpp.rpaths: ["$ORIGIN/../lib/qtcreator"]
@@ -177,7 +175,7 @@ Project {
         Group {
             condition: qbs.targetOS == "linux" || qbs.targetOS == "macx"
             files: "bin/qtcreator.sh"
-            fileTags: "install"
+            qbs.install: true
             qbs.installDir: "bin"
         }
 
@@ -194,6 +192,11 @@ Project {
                "src/shared/qtlockedfile/qtlockedfile_win.cpp"
            ]
         }
+
+        Group {
+            fileTagsFilter: product.type
+            qbs.install: true
+            qbs.installDir: "bin"
+        }
     }
 }
-
diff --git a/share/qtcreator/translations/translations.qbs b/share/qtcreator/translations/translations.qbs
index d6d7534d1c..f6fc8f8813 100644
--- a/share/qtcreator/translations/translations.qbs
+++ b/share/qtcreator/translations/translations.qbs
@@ -4,6 +4,11 @@ Product {
     type: "qm"
     name: "translations"
     Depends { name: "Qt.core" }
-    destination: "share/qtcreator/translations"
     files: "*.ts"
+
+    Group {
+        fileTagsFilter: product.type
+        qbs.install: true
+        qbs.installDir: "share/qtcreator/translations"
+    }
 }
diff --git a/share/share.qbs b/share/share.qbs
index fcfc8e5b66..e998dcbc7f 100644
--- a/share/share.qbs
+++ b/share/share.qbs
@@ -1,31 +1,32 @@
 import qbs.base 1.0
 
 Product {
-    type: ["installed_content"]
     name: "SharedContent"
 
     Group {
-        qbs.installDir: "share"
-        fileTags: ["install"]
-        files: "qtcreator"
-        recursive: true
-        excludeFiles: [
-            "qtcreator/translations",
-            "qtcreator/scripts",
-            "share.pro",
-            "share.qbs",
-            "static.pro",
+        qbs.install: true
+        qbs.installDir: "share/qtcreator"
+        prefix: "qtcreator/"
+        files: [
+            "designer",
+            "dumper",
+            "generic-highlighter",
+            "glsl",
+            "qml",
+            "qmldesigner",
+            "qmlicons",
+            "qml-type-descriptions",
+            "schemes",
+            "snippets",
+            "styles",
+            "templates",
+            "welcomescreen"
         ]
     }
 
     Group {
-        fileTags: ["install"]
-        files: "qtcreator/scripts/openTerminal.command"
-    }
-
-    Group {
+        qbs.install: true
         qbs.installDir: "share/qtcreator/externaltools"
-        fileTags: ["install"]
         prefix: "../src/share/qtcreator/externaltools/"
         files: {
             var list = [
diff --git a/src/libs/QtcLibrary.qbs b/src/libs/QtcLibrary.qbs
index 3e97e4a59d..ce553a06f9 100644
--- a/src/libs/QtcLibrary.qbs
+++ b/src/libs/QtcLibrary.qbs
@@ -15,15 +15,19 @@ DynamicLibrary {
     }
     cpp.includePaths: [ "." ]
 
-    destination: {
-        if (qbs.targetOS == "windows")
-            return "bin"
-        else
-            return "lib/qtcreator"
-    }
-
     ProductModule {
         Depends { name: "cpp" }
         cpp.includePaths: [ "." ]
     }
+
+    Group {
+        fileTagsFilter: product.type
+        qbs.install: true
+        qbs.installDir: {
+            if (qbs.targetOS == "windows")
+                return "bin"
+            else
+                return "lib/qtcreator"
+        }
+    }
 }
diff --git a/src/libs/qtcomponents/styleitem/styleitem.qbs b/src/libs/qtcomponents/styleitem/styleitem.qbs
index a233b0771a..3577fe4712 100644
--- a/src/libs/qtcomponents/styleitem/styleitem.qbs
+++ b/src/libs/qtcomponents/styleitem/styleitem.qbs
@@ -3,7 +3,6 @@ import "../../../../qbs/defaults.js" as Defaults
 
 DynamicLibrary {
     name: "styleplugin"
-    destination: "lib/qtcreator/qtcomponents/plugin"
 
     Depends { name: "cpp" }
     Depends { name: "Qt"; submodules: ["core", "widgets", "declarative", "script"] }
@@ -29,5 +28,10 @@ DynamicLibrary {
         "qwheelarea.cpp",
         "qwheelarea.h",
     ]
-}
 
+    Group {
+        fileTagsFilter: product.type
+        qbs.install: true
+        qbs.installDir: "lib/qtcreator/qtcomponents/plugin"
+    }
+}
diff --git a/src/plugins/QtcPlugin.qbs b/src/plugins/QtcPlugin.qbs
index eed5f30f61..9a2f701f29 100644
--- a/src/plugins/QtcPlugin.qbs
+++ b/src/plugins/QtcPlugin.qbs
@@ -6,7 +6,6 @@ Product {
     type: ["dynamiclibrary", "pluginSpec"]
     property string provider: 'QtProject'
     property var pluginspecreplacements
-    destination: "lib/qtcreator/plugins/" + provider
     targetName: {
         // see PluginSpecPrivate::loadLibrary()
         if (qbs.debugInformation) {
@@ -40,4 +39,10 @@ Product {
         files: [ product.name + ".pluginspec.in" ]
         fileTags: ["pluginSpecIn"]
     }
+
+    Group {
+        fileTagsFilter: product.type
+        qbs.install: true
+        qbs.installDir: "lib/qtcreator/plugins/" + provider
+    }
 }
diff --git a/src/plugins/android/android.qbs b/src/plugins/android/android.qbs
index bd2a2e83dd..62304534b5 100644
--- a/src/plugins/android/android.qbs
+++ b/src/plugins/android/android.qbs
@@ -13,7 +13,7 @@ QtcPlugin {
     Depends { name: "Qt"; submodules: ["widgets", "xml", "network"] }
 
     property bool enable: false
-    property var pluginspecreplacements: ({"ANDROID_EXPERIMENTAL_STR": (enable ? "false": "true")})
+    pluginspecreplacements: ({"ANDROID_EXPERIMENTAL_STR": (enable ? "false": "true")})
 
     cpp.includePaths: base.concat("../../shared")
 
diff --git a/src/plugins/coreplugin/images/logo/logo.qbs b/src/plugins/coreplugin/images/logo/logo.qbs
index 71737dcffc..c0c401a88b 100644
--- a/src/plugins/coreplugin/images/logo/logo.qbs
+++ b/src/plugins/coreplugin/images/logo/logo.qbs
@@ -2,54 +2,53 @@ import qbs.base 1.0
 
 Product {
     condition: qbs.targetOS == "linux"
-    type: ["installed_content"]
     name: "LogoImages"
 
     Group {
+        qbs.install: true
         qbs.installDir: "share/icons/hicolor/16x16/apps"
-        fileTags: ["install"]
         files: ["16/QtProject-qtcreator.png"]
     }
 
     Group {
+        qbs.install: true
         qbs.installDir: "share/icons/hicolor/24x24/apps"
-        fileTags: ["install"]
         files: ["24/QtProject-qtcreator.png"]
     }
 
     Group {
+        qbs.install: true
         qbs.installDir: "share/icons/hicolor/32x32/apps"
-        fileTags: ["install"]
         files: ["32/QtProject-qtcreator.png"]
     }
 
     Group {
+        qbs.install: true
         qbs.installDir: "share/icons/hicolor/48x48/apps"
-        fileTags: ["install"]
         files: ["48/QtProject-qtcreator.png"]
     }
 
     Group {
+        qbs.install: true
         qbs.installDir: "share/icons/hicolor/64x64/apps"
-        fileTags: ["install"]
         files: ["64/QtProject-qtcreator.png"]
     }
 
     Group {
+        qbs.install: true
         qbs.installDir: "share/icons/hicolor/128x128/apps"
-        fileTags: ["install"]
         files: ["128/QtProject-qtcreator.png"]
     }
 
     Group {
+        qbs.install: true
         qbs.installDir: "share/icons/hicolor/256x256/apps"
-        fileTags: ["install"]
         files: ["256/QtProject-qtcreator.png"]
     }
 
     Group {
+        qbs.install: true
         qbs.installDir: "share/icons/hicolor/512x512/apps"
-        fileTags: ["install"]
         files: ["512/QtProject-qtcreator.png"]
     }
 }
diff --git a/src/plugins/debugger/debugger.qbs b/src/plugins/debugger/debugger.qbs
index df334e33c1..1cbbd2c482 100644
--- a/src/plugins/debugger/debugger.qbs
+++ b/src/plugins/debugger/debugger.qbs
@@ -5,7 +5,6 @@ import "../../../qbs/defaults.js" as Defaults
 
 QtcPlugin {
     name: "Debugger"
-    type: base.concat(["installed_content"])
 
     Depends { name: "Qt"; submodules: ["widgets", "network", "script"] }
     Depends { name: "Core" }
@@ -29,8 +28,8 @@ QtcPlugin {
 
     Group {
         condition: Defaults.testsEnabled(qbs)
+        qbs.install: true
         qbs.installDir: "tests/manual/debugger/simple/"
-        fileTags: ["install"]
         files: ["../../../tests/manual/debugger/simple/simple.pro"]
     }
 
diff --git a/src/plugins/updateinfo/updateinfo.qbs b/src/plugins/updateinfo/updateinfo.qbs
index a7d0a12407..94fd2e2b1f 100644
--- a/src/plugins/updateinfo/updateinfo.qbs
+++ b/src/plugins/updateinfo/updateinfo.qbs
@@ -11,7 +11,7 @@ QtcPlugin {
     Depends { name: "Qt"; submodules: ["widgets", "xml", "network"] }
 
     property bool enable: false
-    property var pluginspecreplacements: ({"UPDATEINFO_EXPERIMENTAL_STR": (enable ? "false": "true")})
+    pluginspecreplacements: ({"UPDATEINFO_EXPERIMENTAL_STR": (enable ? "false": "true")})
 
     cpp.includePaths: [
         "..",
diff --git a/src/tools/QtcTool.qbs b/src/tools/QtcTool.qbs
index a8b4f4d522..2ae70db106 100644
--- a/src/tools/QtcTool.qbs
+++ b/src/tools/QtcTool.qbs
@@ -9,5 +9,9 @@ Application {
             return ["-Wl,-s"]
     }
 
-    destination: "bin"
+    Group {
+        fileTagsFilter: product.type
+        qbs.install: true
+        qbs.installDir: "bin"
+    }
 }