1 files changed, 62 insertions, 82 deletions
diff --git a/src/libs/cplusplus/cplusplus.qbs b/src/libs/cplusplus/cplusplus.qbs
index b683783900d..9df7f897079 100644
--- a/src/libs/cplusplus/cplusplus.qbs
+++ b/src/libs/cplusplus/cplusplus.qbs
@@ -85,88 +85,68 @@ QtcLibrary {
         ]
     }
 
-    files: [
-        "AlreadyConsideredClassContainer.h",
-        "ASTParent.cpp",
-        "ASTParent.h",
-        "ASTPath.cpp",
-        "ASTPath.h",
-        "BackwardsScanner.cpp",
-        "BackwardsScanner.h",
-        "CppDocument.cpp",
-        "CppDocument.h",
-        "CppRewriter.cpp",
-        "CppRewriter.h",
-        "DependencyTable.cpp",
-        "DependencyTable.h",
-        "DeprecatedGenTemplateInstance.cpp",
-        "DeprecatedGenTemplateInstance.h",
-        "ExpressionUnderCursor.cpp",
-        "ExpressionUnderCursor.h",
-        "FastPreprocessor.cpp",
-        "FastPreprocessor.h",
-        "FindUsages.cpp",
-        "FindUsages.h",
-        "Icons.cpp",
-        "Icons.h",
-        "LookupContext.cpp",
-        "LookupContext.h",
-        "LookupItem.cpp",
-        "LookupItem.h",
-        "Macro.cpp",
-        "Macro.h",
-        "MatchingText.cpp",
-        "MatchingText.h",
-        "NamePrettyPrinter.cpp",
-        "NamePrettyPrinter.h",
-        "Overview.cpp",
-        "Overview.h",
-        "OverviewModel.cpp",
-        "OverviewModel.h",
-        "PPToken.cpp",
-        "PPToken.h",
-        "PreprocessorClient.cpp",
-        "PreprocessorClient.h",
-        "PreprocessorEnvironment.cpp",
-        "PreprocessorEnvironment.h",
-        "ResolveExpression.cpp",
-        "ResolveExpression.h",
-        "SimpleLexer.cpp",
-        "SimpleLexer.h",
-        "SnapshotSymbolVisitor.cpp",
-        "SnapshotSymbolVisitor.h",
-        "SymbolNameVisitor.cpp",
-        "SymbolNameVisitor.h",
-        "TypeOfExpression.cpp",
-        "TypeOfExpression.h",
-        "TypePrettyPrinter.cpp",
-        "TypePrettyPrinter.h",
-        "cplusplus.qrc",
-        "findcdbbreakpoint.cpp",
-        "findcdbbreakpoint.h",
-        "pp-cctype.h",
-        "pp-engine.cpp",
-        "pp-engine.h",
-        "pp-scanner.cpp",
-        "pp-scanner.h",
-        "pp.h",
-        "images/class.png",
-        "images/enum.png",
-        "images/enumerator.png",
-        "images/func.png",
-        "images/func_priv.png",
-        "images/func_prot.png",
-        "images/keyword.png",
-        "images/macro.png",
-        "images/namespace.png",
-        "images/signal.png",
-        "images/slot.png",
-        "images/slot_priv.png",
-        "images/slot_prot.png",
-        "images/var.png",
-        "images/var_priv.png",
-        "images/var_prot.png",
-    ]
+    Group {
+        name: "General"
+        files: [
+            "AlreadyConsideredClassContainer.h",
+            "ASTParent.cpp", "ASTParent.h",
+            "ASTPath.cpp", "ASTPath.h",
+            "BackwardsScanner.cpp", "BackwardsScanner.h",
+            "CppDocument.cpp", "CppDocument.h",
+            "CppRewriter.cpp", "CppRewriter.h",
+            "DependencyTable.cpp", "DependencyTable.h",
+            "DeprecatedGenTemplateInstance.cpp", "DeprecatedGenTemplateInstance.h",
+            "ExpressionUnderCursor.cpp", "ExpressionUnderCursor.h",
+            "FastPreprocessor.cpp", "FastPreprocessor.h",
+            "FindUsages.cpp", "FindUsages.h",
+            "Icons.cpp", "Icons.h",
+            "LookupContext.cpp", "LookupContext.h",
+            "LookupItem.cpp", "LookupItem.h",
+            "Macro.cpp", "Macro.h",
+            "MatchingText.cpp", "MatchingText.h",
+            "NamePrettyPrinter.cpp", "NamePrettyPrinter.h",
+            "Overview.cpp", "Overview.h",
+            "OverviewModel.cpp", "OverviewModel.h",
+            "PPToken.cpp", "PPToken.h",
+            "PreprocessorClient.cpp", "PreprocessorClient.h",
+            "PreprocessorEnvironment.cpp", "PreprocessorEnvironment.h",
+            "ResolveExpression.cpp", "ResolveExpression.h",
+            "SimpleLexer.cpp", "SimpleLexer.h",
+            "SnapshotSymbolVisitor.cpp", "SnapshotSymbolVisitor.h",
+            "SymbolNameVisitor.cpp", "SymbolNameVisitor.h",
+            "TypeOfExpression.cpp", "TypeOfExpression.h",
+            "TypePrettyPrinter.cpp", "TypePrettyPrinter.h",
+            "cplusplus.qrc",
+            "findcdbbreakpoint.cpp", "findcdbbreakpoint.h",
+            "pp-cctype.h",
+            "pp-engine.cpp", "pp-engine.h",
+            "pp-scanner.cpp", "pp-scanner.h",
+            "pp.h",
+        ]
+    }
+
+    Group {
+        name: "Images"
+        prefix: "images/"
+        files: [
+            "class.png",
+            "enum.png",
+            "enumerator.png",
+            "func.png",
+            "func_priv.png",
+            "func_prot.png",
+            "keyword.png",
+            "macro.png",
+            "namespace.png",
+            "signal.png",
+            "slot.png",
+            "slot_priv.png",
+            "slot_prot.png",
+            "var.png",
+            "var_priv.png",
+            "var_prot.png",
+        ]
+    }
 
     Export {
         cpp.includePaths: [