Consistently give qbs groups a name.

These nicely show up in the project tree in Qt Creator then.

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

18 files changed, 47 insertions, 9 deletions

diff --git a/lib/qtcreator/qtcomponents/qtcomponents.qbs b/lib/qtcreator/qtcomponents/qtcomponents.qbs
index e3e7a5e601..83b621199f 100644
--- a/lib/qtcreator/qtcomponents/qtcomponents.qbs
+++ b/lib/qtcreator/qtcomponents/qtcomponents.qbs
@@ -4,6 +4,7 @@ Product {
     name: "QtComponents"
 
     Group {
+        name: "Resources"
         qbs.install: true
         qbs.installDir: (qbs.targetOS == "windows" ? "lib/qtcreator" : project.ide_library_path)
                         + "/qtcomponents"
diff --git a/qtcreator.qbs b/qtcreator.qbs
index a540753b13..a5be603a11 100644
--- a/qtcreator.qbs
+++ b/qtcreator.qbs
@@ -204,6 +204,7 @@ Project {
         ]
 
         Group {
+            name: "qtcreator.sh"
             condition: qbs.targetPlatform.indexOf("unix") != -1 && qbs.targetOS != "mac"
             files: "bin/qtcreator.sh"
             qbs.install: true
@@ -211,17 +212,19 @@ Project {
         }
 
         Group {
-           condition: qbs.targetPlatform.indexOf("unix") != -1
-           files: [
-               "src/shared/qtlockedfile/qtlockedfile_unix.cpp"
-           ]
+            name: "QtLockedFile_unix"
+            condition: qbs.targetPlatform.indexOf("unix") != -1
+            files: [
+                "src/shared/qtlockedfile/qtlockedfile_unix.cpp"
+            ]
         }
 
         Group {
-           condition: qbs.targetOS == "windows"
-           files: [
-               "src/shared/qtlockedfile/qtlockedfile_win.cpp"
-           ]
+            name: "QtLockedFile_win"
+            condition: qbs.targetOS == "windows"
+            files: [
+                "src/shared/qtlockedfile/qtlockedfile_win.cpp"
+            ]
         }
 
         Group {
diff --git a/share/qtcreator/translations/translations.qbs b/share/qtcreator/translations/translations.qbs
index 5f9dba6639..c6cd066083 100644
--- a/share/qtcreator/translations/translations.qbs
+++ b/share/qtcreator/translations/translations.qbs
@@ -1,8 +1,8 @@
 import qbs.base 1.0
 
 Product {
+    name: "Translations"
     type: "qm"
-    name: "translations"
     Depends { name: "Qt.core" }
     files: "*.ts"
 
diff --git a/share/share.qbs b/share/share.qbs
index 7f4689d33f..6b29c3bb18 100644
--- a/share/share.qbs
+++ b/share/share.qbs
@@ -4,6 +4,7 @@ Product {
     name: "SharedContent"
 
     Group {
+        name: "Unconditional"
         qbs.install: true
         qbs.installDir: project.ide_data_path
         prefix: "qtcreator/"
@@ -25,6 +26,7 @@ Product {
     }
 
     Group {
+        name: "Conditional"
         qbs.install: true
         qbs.installDir: project.ide_data_path + "/externaltools"
         prefix: "../src/share/qtcreator/externaltools/"
diff --git a/src/libs/cplusplus/cplusplus.qbs b/src/libs/cplusplus/cplusplus.qbs
index c9c9c941e6..b683783900 100644
--- a/src/libs/cplusplus/cplusplus.qbs
+++ b/src/libs/cplusplus/cplusplus.qbs
@@ -14,6 +14,7 @@ QtcLibrary {
     Depends { name: "Qt.widgets" }
 
     Group {
+        name: "ThirdPartyCPlusPlus"
         prefix: "../3rdparty/cplusplus/"
         files: [
             "AST.cpp",
diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs
index a2efd78a20..347dbc7edb 100644
--- a/src/libs/utils/utils.qbs
+++ b/src/libs/utils/utils.qbs
@@ -181,6 +181,7 @@ QtcLibrary {
     ]
 
     Group {
+        name: "Tooltip"
         prefix: "tooltip/"
         files: [
             "effects.h",
@@ -195,6 +196,7 @@ QtcLibrary {
     }
 
     Group {
+        name: "WindowsUtils"
         condition: qbs.targetOS == "windows"
         files: [
             "consoleprocess_win.cpp",
@@ -204,6 +206,7 @@ QtcLibrary {
     }
 
     Group {
+        name: "ConsoleProcess_unix"
         condition: qbs.targetPlatform.indexOf("unix") != -1
         files: [
             "consoleprocess_unix.cpp",
diff --git a/src/plugins/coreplugin/coreplugin.qbs b/src/plugins/coreplugin/coreplugin.qbs
index 11f50003d0..d85541e1d0 100644
--- a/src/plugins/coreplugin/coreplugin.qbs
+++ b/src/plugins/coreplugin/coreplugin.qbs
@@ -232,6 +232,7 @@ QtcPlugin {
     ]
 
     Group {
+        name: "ProgressManager_win"
         condition: qbs.targetOS == "windows"
         files: [
             "progressmanager/progressmanager_win.cpp",
@@ -239,6 +240,7 @@ QtcPlugin {
     }
 
     Group {
+        name: "ProgressManager_mac"
         condition: qbs.targetOS == "mac"
         files: [
             "macfullscreen.h",
@@ -248,6 +250,7 @@ QtcPlugin {
     }
 
     Group {
+        name: "ProgressManager_x11"
         condition: qbs.targetPlatform.indexOf("unix") != -1 && qbs.targetOS != "mac"
         files: [
             "progressmanager/progressmanager_x11.cpp",
diff --git a/src/plugins/coreplugin/images/logo/logo.qbs b/src/plugins/coreplugin/images/logo/logo.qbs
index c0c401a88b..0ff76277f9 100644
--- a/src/plugins/coreplugin/images/logo/logo.qbs
+++ b/src/plugins/coreplugin/images/logo/logo.qbs
@@ -5,48 +5,56 @@ Product {
     name: "LogoImages"
 
     Group {
+        name: "16x16"
         qbs.install: true
         qbs.installDir: "share/icons/hicolor/16x16/apps"
         files: ["16/QtProject-qtcreator.png"]
     }
 
     Group {
+        name: "24x24"
         qbs.install: true
         qbs.installDir: "share/icons/hicolor/24x24/apps"
         files: ["24/QtProject-qtcreator.png"]
     }
 
     Group {
+        name: "32x32"
         qbs.install: true
         qbs.installDir: "share/icons/hicolor/32x32/apps"
         files: ["32/QtProject-qtcreator.png"]
     }
 
     Group {
+        name: "48x48"
         qbs.install: true
         qbs.installDir: "share/icons/hicolor/48x48/apps"
         files: ["48/QtProject-qtcreator.png"]
     }
 
     Group {
+        name: "64x64"
         qbs.install: true
         qbs.installDir: "share/icons/hicolor/64x64/apps"
         files: ["64/QtProject-qtcreator.png"]
     }
 
     Group {
+        name: "128x128"
         qbs.install: true
         qbs.installDir: "share/icons/hicolor/128x128/apps"
         files: ["128/QtProject-qtcreator.png"]
     }
 
     Group {
+        name: "256x256"
         qbs.install: true
         qbs.installDir: "share/icons/hicolor/256x256/apps"
         files: ["256/QtProject-qtcreator.png"]
     }
 
     Group {
+        name: "512x512"
         qbs.install: true
         qbs.installDir: "share/icons/hicolor/512x512/apps"
         files: ["512/QtProject-qtcreator.png"]
diff --git a/src/plugins/cpaster/cpaster.qbs b/src/plugins/cpaster/cpaster.qbs
index 9bc42c490c..c1857e6106 100644
--- a/src/plugins/cpaster/cpaster.qbs
+++ b/src/plugins/cpaster/cpaster.qbs
@@ -51,6 +51,7 @@ QtcPlugin {
     ]
 
     Group {
+        name: "Shared"
         prefix: "../../shared/cpaster/"
         files: [
             "cgi.cpp",
diff --git a/src/plugins/cppeditor/cppeditor.qbs b/src/plugins/cppeditor/cppeditor.qbs
index 6dbbff538d..e910cfb6f9 100644
--- a/src/plugins/cppeditor/cppeditor.qbs
+++ b/src/plugins/cppeditor/cppeditor.qbs
@@ -55,6 +55,7 @@ QtcPlugin {
     ]
 
     Group {
+        name: "Tests"
         condition: Defaults.testsEnabled(qbs)
         files: [
             "cppdoxygen_test.cpp",
diff --git a/src/plugins/cpptools/cpptools.qbs b/src/plugins/cpptools/cpptools.qbs
index 6f7114b370..192f02d9d5 100644
--- a/src/plugins/cpptools/cpptools.qbs
+++ b/src/plugins/cpptools/cpptools.qbs
@@ -111,6 +111,7 @@ QtcPlugin {
     ]
 
     Group {
+        name: "Tests"
         condition: Defaults.testsEnabled(qbs)
         files: [
             "cppcodegen_test.cpp",
diff --git a/src/plugins/debugger/debugger.qbs b/src/plugins/debugger/debugger.qbs
index d88065a8d7..081fe8b460 100644
--- a/src/plugins/debugger/debugger.qbs
+++ b/src/plugins/debugger/debugger.qbs
@@ -29,6 +29,7 @@ QtcPlugin {
     ]
 
     Group {
+        name: "Tests"
         condition: Defaults.testsEnabled(qbs)
         qbs.install: true
         qbs.installDir: "tests/manual/debugger/simple/"
@@ -266,6 +267,7 @@ QtcPlugin {
     ]
 
     Group {
+        name: "RegistryAccess"
         condition: qbs.targetOS == "windows"
         prefix: "../../shared/registryaccess/"
         files: [
@@ -275,6 +277,7 @@ QtcPlugin {
     }
 
     Group {
+        name: "RegisterPostMortem"
         condition: qbs.targetOS == "windows"
         files: [
             "registerpostmortemaction.cpp",
@@ -283,6 +286,7 @@ QtcPlugin {
     }
 
     Group {
+        name: "LLDBOptions"
         condition: qbs.targetOS == "mac"
         files: [
             "lldblib/lldboptionspage.cpp",
diff --git a/src/plugins/fakevim/fakevim.qbs b/src/plugins/fakevim/fakevim.qbs
index 218897eb2e..17fa0a7e88 100644
--- a/src/plugins/fakevim/fakevim.qbs
+++ b/src/plugins/fakevim/fakevim.qbs
@@ -22,6 +22,7 @@ QtcPlugin {
     ]
 
     Group {
+        name: "Tests"
         condition: Defaults.testsEnabled(qbs)
         files: ["fakevim_test.cpp"]
     }
diff --git a/src/plugins/git/git.qbs b/src/plugins/git/git.qbs
index 2fdd1b6b96..89abab418d 100644
--- a/src/plugins/git/git.qbs
+++ b/src/plugins/git/git.qbs
@@ -76,6 +76,7 @@ QtcPlugin {
     ]
 
     Group {
+        name: "Gitorious"
         prefix: "gitorious/"
         files: [
             "gitorious.cpp",
@@ -99,6 +100,7 @@ QtcPlugin {
     }
 
     Group {
+        name: "Gerrit"
         prefix: "gerrit/"
         files: [
             "gerritdialog.cpp",
diff --git a/src/plugins/projectexplorer/projectexplorer.qbs b/src/plugins/projectexplorer/projectexplorer.qbs
index a63070d2b9..9026717cde 100644
--- a/src/plugins/projectexplorer/projectexplorer.qbs
+++ b/src/plugins/projectexplorer/projectexplorer.qbs
@@ -333,6 +333,7 @@ QtcPlugin {
     ]
 
     Group {
+        name: "WindowsToolChains"
         condition: qbs.targetOS == "windows" || Defaults.testsEnabled(qbs)
         files: [
            "abstractmsvctoolchain.cpp",
@@ -349,6 +350,7 @@ QtcPlugin {
     }
 
     Group {
+        name: "Tests"
         condition: Defaults.testsEnabled(qbs)
         files: ["outputparser_test.h", "outputparser_test.cpp"]
     }
diff --git a/src/plugins/qmljstools/qmljstools.qbs b/src/plugins/qmljstools/qmljstools.qbs
index dc8b1f78b2..8e61109c0d 100644
--- a/src/plugins/qmljstools/qmljstools.qbs
+++ b/src/plugins/qmljstools/qmljstools.qbs
@@ -74,6 +74,7 @@ QtcPlugin {
     ]
 
     Group {
+        name: "Tests"
         condition: Defaults.testsEnabled(qbs)
         files: ["qmljstools_test.cpp"]
     }
diff --git a/src/plugins/qtsupport/qtsupport.qbs b/src/plugins/qtsupport/qtsupport.qbs
index b494f19dc2..0fff27ad2a 100644
--- a/src/plugins/qtsupport/qtsupport.qbs
+++ b/src/plugins/qtsupport/qtsupport.qbs
@@ -27,6 +27,7 @@ QtcPlugin {
     ])
 
     Group {
+        name: "Shared"
         prefix: "../../shared/proparser/"
         files: [
             "ioutils.cpp",
diff --git a/src/plugins/texteditor/texteditor.qbs b/src/plugins/texteditor/texteditor.qbs
index 6998dbf478..de50ca7bf7 100644
--- a/src/plugins/texteditor/texteditor.qbs
+++ b/src/plugins/texteditor/texteditor.qbs
@@ -149,6 +149,7 @@ QtcPlugin {
     ]
 
     Group {
+        name: "CodeAssist"
         prefix: "codeassist/"
         files: [
             "assistenums.h",
@@ -200,6 +201,7 @@ QtcPlugin {
     }
 
     Group {
+        name: "GenericHighlighter"
         prefix: "generichighlighter/"
         files: [
             "context.cpp",
@@ -243,6 +245,7 @@ QtcPlugin {
     }
 
     Group {
+        name: "Snippets"
         prefix: "snippets/"
         files: [
             "isnippetprovider.cpp",