1 files changed, 38 insertions, 32 deletions
diff --git a/src/lib/corelib/corelib.qbs b/src/lib/corelib/corelib.qbs
index 358e6e353..1056970cf 100644
--- a/src/lib/corelib/corelib.qbs
+++ b/src/lib/corelib/corelib.qbs
@@ -266,10 +266,6 @@ QbsLibrary {
         files: [
             "artifactproperties.cpp",
             "artifactproperties.h",
-            "astimportshandler.cpp",
-            "astimportshandler.h",
-            "astpropertiesitemhandler.cpp",
-            "astpropertiesitemhandler.h",
             "asttools.cpp",
             "asttools.h",
             "builtindeclarations.cpp",
@@ -283,8 +279,6 @@ QbsLibrary {
             "filecontextbase.h",
             "filetags.cpp",
             "filetags.h",
-            "groupshandler.cpp",
-            "groupshandler.h",
             "identifiersearch.cpp",
             "identifiersearch.h",
             "item.cpp",
@@ -294,39 +288,13 @@ QbsLibrary {
             "itemobserver.h",
             "itempool.cpp",
             "itempool.h",
-            "itemreader.cpp",
-            "itemreader.h",
-            "itemreaderastvisitor.cpp",
-            "itemreaderastvisitor.h",
-            "itemreadervisitorstate.cpp",
-            "itemreadervisitorstate.h",
             "itemtype.h",
             "jsimports.h",
             "language.cpp",
             "language.h",
-            "loader.cpp",
-            "loader.h",
-            "localprofiles.cpp",
-            "localprofiles.h",
-            "moduleinstantiator.cpp",
-            "moduleinstantiator.h",
-            "moduleloader.cpp",
-            "moduleloader.h",
-            "modulepropertymerger.cpp",
-            "modulepropertymerger.h",
             "moduleproviderinfo.h",
-            "moduleproviderloader.cpp",
-            "moduleproviderloader.h",
             "preparescriptobserver.cpp",
             "preparescriptobserver.h",
-            "probesresolver.cpp",
-            "probesresolver.h",
-            "productitemmultiplexer.cpp",
-            "productitemmultiplexer.h",
-            "projectresolver.cpp",
-            "projectresolver.h",
-            "projecttreebuilder.cpp",
-            "projecttreebuilder.h",
             "property.cpp",
             "property.h",
             "propertydeclaration.cpp",
@@ -354,6 +322,44 @@ QbsLibrary {
         files: "language/forward_decls.h"
     }
     Group {
+        name: "loader"
+        prefix: name + '/'
+        files: [
+            "astimportshandler.cpp",
+            "astimportshandler.h",
+            "astpropertiesitemhandler.cpp",
+            "astpropertiesitemhandler.h",
+            "groupshandler.cpp",
+            "groupshandler.h",
+            "itemreader.cpp",
+            "itemreader.h",
+            "itemreaderastvisitor.cpp",
+            "itemreaderastvisitor.h",
+            "itemreadervisitorstate.cpp",
+            "itemreadervisitorstate.h",
+            "loader.cpp",
+            "loader.h",
+            "localprofiles.cpp",
+            "localprofiles.h",
+            "moduleinstantiator.cpp",
+            "moduleinstantiator.h",
+            "moduleloader.cpp",
+            "moduleloader.h",
+            "modulepropertymerger.cpp",
+            "modulepropertymerger.h",
+            "moduleproviderloader.cpp",
+            "moduleproviderloader.h",
+            "probesresolver.cpp",
+            "probesresolver.h",
+            "productitemmultiplexer.cpp",
+            "productitemmultiplexer.h",
+            "projectresolver.cpp",
+            "projectresolver.h",
+            "projecttreebuilder.cpp",
+            "projecttreebuilder.h",
+        ]
+    }
+    Group {
         name: "logging"
         prefix: name + '/'
         files: [