summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2023-04-28 15:08:11 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2023-05-04 11:18:03 +0000
commit61e53de1f777c84bc0e5d90ad2f18525b726129d (patch)
tree76ba1ac776e895ba329471f1a26c3cd0d8e00b83 /src
parent78afa2b55fab3ef11166e1021f199693a92eeb75 (diff)
downloadqbs-61e53de1f777c84bc0e5d90ad2f18525b726129d.tar.gz
Introduce loader/ subdirectory
Project loading functionality is implemented in various source files these days, so it makes sense to group them together. Change-Id: Iba42b0246c40610d2a03bf6cc7ed7d3bec9d5536 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/lib/corelib/CMakeLists.txt69
-rw-r--r--src/lib/corelib/api/internaljobs.cpp2
-rw-r--r--src/lib/corelib/api/project.cpp1
-rw-r--r--src/lib/corelib/api/projectdata.cpp2
-rw-r--r--src/lib/corelib/buildgraph/buildgraphloader.cpp4
-rw-r--r--src/lib/corelib/corelib.qbs70
-rw-r--r--src/lib/corelib/language/language.cpp2
-rw-r--r--src/lib/corelib/loader/astimportshandler.cpp (renamed from src/lib/corelib/language/astimportshandler.cpp)8
-rw-r--r--src/lib/corelib/loader/astimportshandler.h (renamed from src/lib/corelib/language/astimportshandler.h)2
-rw-r--r--src/lib/corelib/loader/astpropertiesitemhandler.cpp (renamed from src/lib/corelib/language/astpropertiesitemhandler.cpp)4
-rw-r--r--src/lib/corelib/loader/astpropertiesitemhandler.h (renamed from src/lib/corelib/language/astpropertiesitemhandler.h)0
-rw-r--r--src/lib/corelib/loader/groupshandler.cpp (renamed from src/lib/corelib/language/groupshandler.cpp)6
-rw-r--r--src/lib/corelib/loader/groupshandler.h (renamed from src/lib/corelib/language/groupshandler.h)3
-rw-r--r--src/lib/corelib/loader/itemreader.cpp (renamed from src/lib/corelib/language/itemreader.cpp)8
-rw-r--r--src/lib/corelib/loader/itemreader.h (renamed from src/lib/corelib/language/itemreader.h)0
-rw-r--r--src/lib/corelib/loader/itemreaderastvisitor.cpp (renamed from src/lib/corelib/language/itemreaderastvisitor.cpp)12
-rw-r--r--src/lib/corelib/loader/itemreaderastvisitor.h (renamed from src/lib/corelib/language/itemreaderastvisitor.h)4
-rw-r--r--src/lib/corelib/loader/itemreadervisitorstate.cpp (renamed from src/lib/corelib/language/itemreadervisitorstate.cpp)4
-rw-r--r--src/lib/corelib/loader/itemreadervisitorstate.h (renamed from src/lib/corelib/language/itemreadervisitorstate.h)0
-rw-r--r--src/lib/corelib/loader/loader.cpp (renamed from src/lib/corelib/language/loader.cpp)8
-rw-r--r--src/lib/corelib/loader/loader.h (renamed from src/lib/corelib/language/loader.h)4
-rw-r--r--src/lib/corelib/loader/localprofiles.cpp (renamed from src/lib/corelib/language/localprofiles.cpp)11
-rw-r--r--src/lib/corelib/loader/localprofiles.h (renamed from src/lib/corelib/language/localprofiles.h)0
-rw-r--r--src/lib/corelib/loader/moduleinstantiator.cpp (renamed from src/lib/corelib/language/moduleinstantiator.cpp)8
-rw-r--r--src/lib/corelib/loader/moduleinstantiator.h (renamed from src/lib/corelib/language/moduleinstantiator.h)0
-rw-r--r--src/lib/corelib/loader/moduleloader.cpp (renamed from src/lib/corelib/language/moduleloader.cpp)4
-rw-r--r--src/lib/corelib/loader/moduleloader.h (renamed from src/lib/corelib/language/moduleloader.h)4
-rw-r--r--src/lib/corelib/loader/modulepropertymerger.cpp (renamed from src/lib/corelib/language/modulepropertymerger.cpp)7
-rw-r--r--src/lib/corelib/loader/modulepropertymerger.h (renamed from src/lib/corelib/language/modulepropertymerger.h)0
-rw-r--r--src/lib/corelib/loader/moduleproviderloader.cpp (renamed from src/lib/corelib/language/moduleproviderloader.cpp)8
-rw-r--r--src/lib/corelib/loader/moduleproviderloader.h (renamed from src/lib/corelib/language/moduleproviderloader.h)4
-rw-r--r--src/lib/corelib/loader/probesresolver.cpp (renamed from src/lib/corelib/language/probesresolver.cpp)11
-rw-r--r--src/lib/corelib/loader/probesresolver.h (renamed from src/lib/corelib/language/probesresolver.h)2
-rw-r--r--src/lib/corelib/loader/productitemmultiplexer.cpp (renamed from src/lib/corelib/language/productitemmultiplexer.cpp)9
-rw-r--r--src/lib/corelib/loader/productitemmultiplexer.h (renamed from src/lib/corelib/language/productitemmultiplexer.h)0
-rw-r--r--src/lib/corelib/loader/projectresolver.cpp (renamed from src/lib/corelib/language/projectresolver.cpp)21
-rw-r--r--src/lib/corelib/loader/projectresolver.h (renamed from src/lib/corelib/language/projectresolver.h)8
-rw-r--r--src/lib/corelib/loader/projecttreebuilder.cpp (renamed from src/lib/corelib/language/projecttreebuilder.cpp)14
-rw-r--r--src/lib/corelib/loader/projecttreebuilder.h (renamed from src/lib/corelib/language/projecttreebuilder.h)7
39 files changed, 167 insertions, 164 deletions
diff --git a/src/lib/corelib/CMakeLists.txt b/src/lib/corelib/CMakeLists.txt
index 17d770666..ee551b2ca 100644
--- a/src/lib/corelib/CMakeLists.txt
+++ b/src/lib/corelib/CMakeLists.txt
@@ -183,10 +183,6 @@ list_transform_prepend(JS_EXTENSIONS_MACOS_SOURCES jsextensions/)
set(LANGUAGE_SOURCES
artifactproperties.cpp
artifactproperties.h
- astimportshandler.cpp
- astimportshandler.h
- astpropertiesitemhandler.cpp
- astpropertiesitemhandler.h
asttools.cpp
asttools.h
builtindeclarations.cpp
@@ -200,8 +196,6 @@ set(LANGUAGE_SOURCES
filecontextbase.h
filetags.cpp
filetags.h
- groupshandler.cpp
- groupshandler.h
identifiersearch.cpp
identifiersearch.h
item.cpp
@@ -211,39 +205,13 @@ set(LANGUAGE_SOURCES
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
@@ -267,6 +235,42 @@ list_transform_prepend(LANGUAGE_SOURCES language/)
set(LANGUAGE_HEADERS language/forward_decls.h)
+set(LOADER_SOURCES
+ 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
+ )
+list_transform_prepend(LOADER_SOURCES loader/)
+
set(LOGGING_SOURCES
categories.cpp
categories.h
@@ -459,6 +463,7 @@ add_qbs_library(qbscore
${JS_EXTENSIONS_MACOS_SOURCES}
${LANGUAGE_SOURCES}
${LANGUAGE_HEADERS}
+ ${LOADER_SOURCES}
${LOGGING_SOURCES}
${LOGGING_HEADERS}
${PARSER_SOURCES}
diff --git a/src/lib/corelib/api/internaljobs.cpp b/src/lib/corelib/api/internaljobs.cpp
index 6c2987cd2..47990fb32 100644
--- a/src/lib/corelib/api/internaljobs.cpp
+++ b/src/lib/corelib/api/internaljobs.cpp
@@ -49,8 +49,8 @@
#include <buildgraph/productinstaller.h>
#include <buildgraph/rulesevaluationcontext.h>
#include <language/language.h>
-#include <language/loader.h>
#include <language/scriptengine.h>
+#include <loader/loader.h>
#include <logging/logger.h>
#include <logging/translator.h>
#include <tools/buildgraphlocker.h>
diff --git a/src/lib/corelib/api/project.cpp b/src/lib/corelib/api/project.cpp
index 936a86fa6..f2bdd6d88 100644
--- a/src/lib/corelib/api/project.cpp
+++ b/src/lib/corelib/api/project.cpp
@@ -61,7 +61,6 @@
#include <buildgraph/timestampsupdater.h>
#include <buildgraph/transformer.h>
#include <language/language.h>
-#include <language/projectresolver.h>
#include <language/propertymapinternal.h>
#include <logging/logger.h>
#include <logging/translator.h>
diff --git a/src/lib/corelib/api/projectdata.cpp b/src/lib/corelib/api/projectdata.cpp
index a97491955..501a65fdd 100644
--- a/src/lib/corelib/api/projectdata.cpp
+++ b/src/lib/corelib/api/projectdata.cpp
@@ -41,8 +41,8 @@
#include "projectdata_p.h"
#include "propertymap_p.h"
#include <language/language.h>
-#include <language/productitemmultiplexer.h>
#include <language/propertymapinternal.h>
+#include <loader/productitemmultiplexer.h>
#include <tools/fileinfo.h>
#include <tools/jsliterals.h>
#include <tools/qbsassert.h>
diff --git a/src/lib/corelib/buildgraph/buildgraphloader.cpp b/src/lib/corelib/buildgraph/buildgraphloader.cpp
index 66e4e8578..f932da0b8 100644
--- a/src/lib/corelib/buildgraph/buildgraphloader.cpp
+++ b/src/lib/corelib/buildgraph/buildgraphloader.cpp
@@ -45,15 +45,15 @@
#include "projectbuilddata.h"
#include "rulenode.h"
#include "rulecommands.h"
-#include "rulesevaluationcontext.h"
#include "transformer.h"
+#include <buildgraph/rulesevaluationcontext.h>
#include <language/artifactproperties.h>
#include <language/language.h>
-#include <language/loader.h>
#include <language/propertymapinternal.h>
#include <language/qualifiedid.h>
#include <language/resolvedfilecontext.h>
+#include <loader/loader.h>
#include <logging/categories.h>
#include <logging/translator.h>
#include <tools/buildgraphlocker.h>
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: [
diff --git a/src/lib/corelib/language/language.cpp b/src/lib/corelib/language/language.cpp
index fe92caba9..58ca987e9 100644
--- a/src/lib/corelib/language/language.cpp
+++ b/src/lib/corelib/language/language.cpp
@@ -41,7 +41,6 @@
#include "artifactproperties.h"
#include "builtindeclarations.h"
-#include "productitemmultiplexer.h"
#include "propertymapinternal.h"
#include "scriptengine.h"
@@ -52,6 +51,7 @@
#include <buildgraph/rulegraph.h> // TODO: Move to language?
#include <buildgraph/transformer.h>
#include <jsextensions/jsextensions.h>
+#include <loader/productitemmultiplexer.h>
#include <logging/categories.h>
#include <logging/translator.h>
#include <tools/buildgraphlocker.h>
diff --git a/src/lib/corelib/language/astimportshandler.cpp b/src/lib/corelib/loader/astimportshandler.cpp
index d634af7e4..f31084f36 100644
--- a/src/lib/corelib/language/astimportshandler.cpp
+++ b/src/lib/corelib/loader/astimportshandler.cpp
@@ -38,12 +38,12 @@
****************************************************************************/
#include "astimportshandler.h"
-#include "asttools.h"
-#include "builtindeclarations.h"
-#include "filecontext.h"
#include "itemreadervisitorstate.h"
-#include "jsextensions/jsextensions.h"
+#include <jsextensions/jsextensions.h>
+#include <language/asttools.h>
+#include <language/builtindeclarations.h>
+#include <language/filecontext.h>
#include <logging/logger.h>
#include <logging/translator.h>
#include <parser/qmljsast_p.h>
diff --git a/src/lib/corelib/language/astimportshandler.h b/src/lib/corelib/loader/astimportshandler.h
index e9c2b6c27..582e1c698 100644
--- a/src/lib/corelib/language/astimportshandler.h
+++ b/src/lib/corelib/loader/astimportshandler.h
@@ -39,7 +39,7 @@
#ifndef QBS_ASTIMPORTSHANDLER_H
#define QBS_ASTIMPORTSHANDLER_H
-#include "forward_decls.h"
+#include <language/forward_decls.h>
#include <parser/qmljsastfwd_p.h>
#include <tools/set.h>
diff --git a/src/lib/corelib/language/astpropertiesitemhandler.cpp b/src/lib/corelib/loader/astpropertiesitemhandler.cpp
index cc4c02232..fbb8761b5 100644
--- a/src/lib/corelib/language/astpropertiesitemhandler.cpp
+++ b/src/lib/corelib/loader/astpropertiesitemhandler.cpp
@@ -38,8 +38,8 @@
****************************************************************************/
#include "astpropertiesitemhandler.h"
-#include "item.h"
-#include "value.h"
+#include <language/item.h>
+#include <language/value.h>
#include <logging/translator.h>
#include <tools/error.h>
diff --git a/src/lib/corelib/language/astpropertiesitemhandler.h b/src/lib/corelib/loader/astpropertiesitemhandler.h
index 413512ee5..413512ee5 100644
--- a/src/lib/corelib/language/astpropertiesitemhandler.h
+++ b/src/lib/corelib/loader/astpropertiesitemhandler.h
diff --git a/src/lib/corelib/language/groupshandler.cpp b/src/lib/corelib/loader/groupshandler.cpp
index b9acfc553..dd183eb16 100644
--- a/src/lib/corelib/language/groupshandler.cpp
+++ b/src/lib/corelib/loader/groupshandler.cpp
@@ -39,11 +39,11 @@
#include "groupshandler.h"
-#include "evaluator.h"
-#include "item.h"
#include "moduleinstantiator.h"
-#include "value.h"
+#include <language/evaluator.h>
+#include <language/item.h>
+#include <language/value.h>
#include <logging/translator.h>
#include <tools/profiling.h>
#include <tools/setupprojectparameters.h>
diff --git a/src/lib/corelib/language/groupshandler.h b/src/lib/corelib/loader/groupshandler.h
index d3948cbef..3f787903f 100644
--- a/src/lib/corelib/language/groupshandler.h
+++ b/src/lib/corelib/loader/groupshandler.h
@@ -39,8 +39,7 @@
#pragma once
-#include "qualifiedid.h"
-
+#include <language/qualifiedid.h>
#include <tools/set.h>
#include <unordered_map>
diff --git a/src/lib/corelib/language/itemreader.cpp b/src/lib/corelib/loader/itemreader.cpp
index e71eba43d..3af79df2e 100644
--- a/src/lib/corelib/language/itemreader.cpp
+++ b/src/lib/corelib/loader/itemreader.cpp
@@ -39,12 +39,12 @@
#include "itemreader.h"
-#include "deprecationinfo.h"
-#include "evaluator.h"
-#include "item.h"
#include "itemreadervisitorstate.h"
-#include "value.h"
+#include <language/deprecationinfo.h>
+#include <language/evaluator.h>
+#include <language/item.h>
+#include <language/value.h>
#include <tools/profiling.h>
#include <tools/stringconstants.h>
#include <tools/stlutils.h>
diff --git a/src/lib/corelib/language/itemreader.h b/src/lib/corelib/loader/itemreader.h
index 751c9b1b6..751c9b1b6 100644
--- a/src/lib/corelib/language/itemreader.h
+++ b/src/lib/corelib/loader/itemreader.h
diff --git a/src/lib/corelib/language/itemreaderastvisitor.cpp b/src/lib/corelib/loader/itemreaderastvisitor.cpp
index f43104836..94be46bf3 100644
--- a/src/lib/corelib/language/itemreaderastvisitor.cpp
+++ b/src/lib/corelib/loader/itemreaderastvisitor.cpp
@@ -41,16 +41,16 @@
#include "astimportshandler.h"
#include "astpropertiesitemhandler.h"
-#include "asttools.h"
-#include "builtindeclarations.h"
-#include "filecontext.h"
-#include "identifiersearch.h"
-#include "item.h"
#include "itemreadervisitorstate.h"
-#include "value.h"
#include <api/languageinfo.h>
#include <jsextensions/jsextensions.h>
+#include <language/asttools.h>
+#include <language/builtindeclarations.h>
+#include <language/filecontext.h>
+#include <language/identifiersearch.h>
+#include <language/item.h>
+#include <language/value.h>
#include <parser/qmljsast_p.h>
#include <tools/codelocation.h>
#include <tools/error.h>
diff --git a/src/lib/corelib/language/itemreaderastvisitor.h b/src/lib/corelib/loader/itemreaderastvisitor.h
index e8522efd6..a102b2821 100644
--- a/src/lib/corelib/language/itemreaderastvisitor.h
+++ b/src/lib/corelib/loader/itemreaderastvisitor.h
@@ -40,8 +40,8 @@
#ifndef QBS_ITEMREADERASTVISITOR_H
#define QBS_ITEMREADERASTVISITOR_H
-#include "forward_decls.h"
-#include "itemtype.h"
+#include <language/forward_decls.h>
+#include <language/itemtype.h>
#include <logging/logger.h>
#include <parser/qmljsastvisitor_p.h>
diff --git a/src/lib/corelib/language/itemreadervisitorstate.cpp b/src/lib/corelib/loader/itemreadervisitorstate.cpp
index a51b7eab4..57484043a 100644
--- a/src/lib/corelib/language/itemreadervisitorstate.cpp
+++ b/src/lib/corelib/loader/itemreadervisitorstate.cpp
@@ -38,10 +38,10 @@
****************************************************************************/
#include "itemreadervisitorstate.h"
-#include "asttools.h"
-#include "filecontext.h"
#include "itemreaderastvisitor.h"
+#include <language/asttools.h>
+#include <language/filecontext.h>
#include <logging/translator.h>
#include <parser/qmljsengine_p.h>
#include <parser/qmljslexer_p.h>
diff --git a/src/lib/corelib/language/itemreadervisitorstate.h b/src/lib/corelib/loader/itemreadervisitorstate.h
index dc22cfb42..dc22cfb42 100644
--- a/src/lib/corelib/language/itemreadervisitorstate.h
+++ b/src/lib/corelib/loader/itemreadervisitorstate.h
diff --git a/src/lib/corelib/language/loader.cpp b/src/lib/corelib/loader/loader.cpp
index 00d944e5f..82358c96d 100644
--- a/src/lib/corelib/language/loader.cpp
+++ b/src/lib/corelib/loader/loader.cpp
@@ -39,13 +39,13 @@
#include "loader.h"
-#include "evaluator.h"
-#include "itempool.h"
-#include "language.h"
#include "projectresolver.h"
#include "projecttreebuilder.h"
-#include "scriptengine.h"
+#include <language/evaluator.h>
+#include <language/itempool.h>
+#include <language/language.h>
+#include <language/scriptengine.h>
#include <logging/translator.h>
#include <tools/fileinfo.h>
#include <tools/profile.h>
diff --git a/src/lib/corelib/language/loader.h b/src/lib/corelib/loader/loader.h
index 2c8b08446..377ab68d2 100644
--- a/src/lib/corelib/language/loader.h
+++ b/src/lib/corelib/loader/loader.h
@@ -39,8 +39,8 @@
#ifndef QBS_LOADER_H
#define QBS_LOADER_H
-#include "forward_decls.h"
-#include "moduleproviderinfo.h"
+#include <language/forward_decls.h>
+#include <language/moduleproviderinfo.h>
#include <logging/logger.h>
#include <tools/filetime.h>
diff --git a/src/lib/corelib/language/localprofiles.cpp b/src/lib/corelib/loader/localprofiles.cpp
index 1571ee15e..0b73a6ab0 100644
--- a/src/lib/corelib/language/localprofiles.cpp
+++ b/src/lib/corelib/loader/localprofiles.cpp
@@ -39,12 +39,11 @@
#include "localprofiles.h"
-#include "evaluator.h"
-#include "item.h"
-#include "qualifiedid.h"
-#include "scriptengine.h"
-#include "value.h"
-
+#include <language/evaluator.h>
+#include <language/item.h>
+#include <language/qualifiedid.h>
+#include <language/scriptengine.h>
+#include <language/value.h>
#include <logging/translator.h>
#include <tools/profile.h>
#include <tools/scripttools.h>
diff --git a/src/lib/corelib/language/localprofiles.h b/src/lib/corelib/loader/localprofiles.h
index 3e6b77f4d..3e6b77f4d 100644
--- a/src/lib/corelib/language/localprofiles.h
+++ b/src/lib/corelib/loader/localprofiles.h
diff --git a/src/lib/corelib/language/moduleinstantiator.cpp b/src/lib/corelib/loader/moduleinstantiator.cpp
index 91776213a..35f5332af 100644
--- a/src/lib/corelib/language/moduleinstantiator.cpp
+++ b/src/lib/corelib/loader/moduleinstantiator.cpp
@@ -39,12 +39,12 @@
#include "moduleinstantiator.h"
-#include "item.h"
-#include "itempool.h"
#include "modulepropertymerger.h"
-#include "qualifiedid.h"
-#include "value.h"
+#include <language/item.h>
+#include <language/itempool.h>
+#include <language/qualifiedid.h>
+#include <language/value.h>
#include <logging/logger.h>
#include <logging/translator.h>
#include <tools/profiling.h>
diff --git a/src/lib/corelib/language/moduleinstantiator.h b/src/lib/corelib/loader/moduleinstantiator.h
index f235b83fa..f235b83fa 100644
--- a/src/lib/corelib/language/moduleinstantiator.h
+++ b/src/lib/corelib/loader/moduleinstantiator.h
diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/loader/moduleloader.cpp
index 1772ee808..2ad3d8e71 100644
--- a/src/lib/corelib/language/moduleloader.cpp
+++ b/src/lib/corelib/loader/moduleloader.cpp
@@ -39,13 +39,13 @@
#include "moduleloader.h"
-#include "evaluator.h"
#include "itemreader.h"
#include "moduleproviderloader.h"
#include "productitemmultiplexer.h"
-#include "value.h"
#include <api/languageinfo.h>
+#include <language/evaluator.h>
+#include <language/value.h>
#include <logging/categories.h>
#include <logging/translator.h>
#include <tools/error.h>
diff --git a/src/lib/corelib/language/moduleloader.h b/src/lib/corelib/loader/moduleloader.h
index 37ed34c08..6f55ee052 100644
--- a/src/lib/corelib/language/moduleloader.h
+++ b/src/lib/corelib/loader/moduleloader.h
@@ -39,8 +39,8 @@
#pragma once
-#include "forward_decls.h"
-#include "item.h"
+#include <language/forward_decls.h>
+#include <language/item.h>
#include <QString>
#include <QVariantMap>
diff --git a/src/lib/corelib/language/modulepropertymerger.cpp b/src/lib/corelib/loader/modulepropertymerger.cpp
index d45329d12..e3cf1a633 100644
--- a/src/lib/corelib/language/modulepropertymerger.cpp
+++ b/src/lib/corelib/loader/modulepropertymerger.cpp
@@ -39,10 +39,9 @@
#include "modulepropertymerger.h"
-#include "evaluator.h"
-#include "item.h"
-#include "value.h"
-
+#include <language/evaluator.h>
+#include <language/item.h>
+#include <language/value.h>
#include <logging/translator.h>
#include <tools/profiling.h>
#include <tools/set.h>
diff --git a/src/lib/corelib/language/modulepropertymerger.h b/src/lib/corelib/loader/modulepropertymerger.h
index fc388cfbf..fc388cfbf 100644
--- a/src/lib/corelib/language/modulepropertymerger.h
+++ b/src/lib/corelib/loader/modulepropertymerger.h
diff --git a/src/lib/corelib/language/moduleproviderloader.cpp b/src/lib/corelib/loader/moduleproviderloader.cpp
index 22605bf9f..584f43166 100644
--- a/src/lib/corelib/language/moduleproviderloader.cpp
+++ b/src/lib/corelib/loader/moduleproviderloader.cpp
@@ -40,18 +40,16 @@
#include "moduleproviderloader.h"
-#include "builtindeclarations.h"
-#include "evaluator.h"
-#include "item.h"
#include "itemreader.h"
#include "probesresolver.h"
+#include <language/builtindeclarations.h>
+#include <language/evaluator.h>
+#include <language/item.h>
#include <language/scriptengine.h>
#include <language/value.h>
-
#include <logging/categories.h>
#include <logging/translator.h>
-
#include <tools/fileinfo.h>
#include <tools/jsliterals.h>
#include <tools/scripttools.h>
diff --git a/src/lib/corelib/language/moduleproviderloader.h b/src/lib/corelib/loader/moduleproviderloader.h
index b6240cb03..eabb5ead5 100644
--- a/src/lib/corelib/language/moduleproviderloader.h
+++ b/src/lib/corelib/loader/moduleproviderloader.h
@@ -41,8 +41,8 @@
#ifndef MODULEPROVIDERLOADER_H
#define MODULEPROVIDERLOADER_H
-#include "forward_decls.h"
-#include "moduleproviderinfo.h"
+#include <language/forward_decls.h>
+#include <language/moduleproviderinfo.h>
#include <QtCore/qmap.h>
#include <QtCore/qvariant.h>
diff --git a/src/lib/corelib/language/probesresolver.cpp b/src/lib/corelib/loader/probesresolver.cpp
index 1462c706b..a1f2e1baa 100644
--- a/src/lib/corelib/language/probesresolver.cpp
+++ b/src/lib/corelib/loader/probesresolver.cpp
@@ -40,16 +40,15 @@
#include "probesresolver.h"
-#include "evaluator.h"
-#include "filecontext.h"
-#include "item.h"
#include "itemreader.h"
-#include "language.h"
-#include "scriptengine.h"
-#include "value.h"
#include <api/languageinfo.h>
+#include <language/evaluator.h>
+#include <language/filecontext.h>
+#include <language/item.h>
#include <language/language.h>
+#include <language/scriptengine.h>
+#include <language/value.h>
#include <logging/categories.h>
#include <logging/logger.h>
#include <logging/translator.h>
diff --git a/src/lib/corelib/language/probesresolver.h b/src/lib/corelib/loader/probesresolver.h
index 4aae0b887..4c7cd93ac 100644
--- a/src/lib/corelib/language/probesresolver.h
+++ b/src/lib/corelib/loader/probesresolver.h
@@ -41,7 +41,7 @@
#ifndef PROBESRESOLVER_H
#define PROBESRESOLVER_H
-#include "forward_decls.h"
+#include <language/forward_decls.h>
#include <tools/filetime.h>
diff --git a/src/lib/corelib/language/productitemmultiplexer.cpp b/src/lib/corelib/loader/productitemmultiplexer.cpp
index c737be7f1..5f8e9f472 100644
--- a/src/lib/corelib/language/productitemmultiplexer.cpp
+++ b/src/lib/corelib/loader/productitemmultiplexer.cpp
@@ -39,11 +39,10 @@
#include "productitemmultiplexer.h"
-#include "evaluator.h"
-#include "item.h"
-#include "scriptengine.h"
-#include "value.h"
-
+#include <language/evaluator.h>
+#include <language/item.h>
+#include <language/scriptengine.h>
+#include <language/value.h>
#include <logging/translator.h>
#include <tools/scripttools.h>
#include <tools/setupprojectparameters.h>
diff --git a/src/lib/corelib/language/productitemmultiplexer.h b/src/lib/corelib/loader/productitemmultiplexer.h
index d99267336..d99267336 100644
--- a/src/lib/corelib/language/productitemmultiplexer.h
+++ b/src/lib/corelib/loader/productitemmultiplexer.h
diff --git a/src/lib/corelib/language/projectresolver.cpp b/src/lib/corelib/loader/projectresolver.cpp
index 403fd35bc..564c2f3ea 100644
--- a/src/lib/corelib/language/projectresolver.cpp
+++ b/src/lib/corelib/loader/projectresolver.cpp
@@ -39,19 +39,18 @@
#include "projectresolver.h"
-#include "artifactproperties.h"
-#include "builtindeclarations.h"
-#include "evaluator.h"
-#include "filecontext.h"
-#include "item.h"
-#include "language.h"
-#include "propertymapinternal.h"
-#include "resolvedfilecontext.h"
-#include "scriptengine.h"
-#include "value.h"
-
#include <jsextensions/jsextensions.h>
#include <jsextensions/moduleproperties.h>
+#include <language/artifactproperties.h>
+#include <language/builtindeclarations.h>
+#include <language/evaluator.h>
+#include <language/filecontext.h>
+#include <language/item.h>
+#include <language/language.h>
+#include <language/propertymapinternal.h>
+#include <language/resolvedfilecontext.h>
+#include <language/scriptengine.h>
+#include <language/value.h>
#include <logging/categories.h>
#include <logging/translator.h>
#include <tools/error.h>
diff --git a/src/lib/corelib/language/projectresolver.h b/src/lib/corelib/loader/projectresolver.h
index a8b06b6e6..e29e1964c 100644
--- a/src/lib/corelib/language/projectresolver.h
+++ b/src/lib/corelib/loader/projectresolver.h
@@ -40,12 +40,12 @@
#ifndef PROJECTRESOLVER_H
#define PROJECTRESOLVER_H
-#include "filetags.h"
-#include "item.h"
-#include "itemtype.h"
#include "projecttreebuilder.h"
-#include "qualifiedid.h"
+#include <language/filetags.h>
+#include <language/item.h>
+#include <language/itemtype.h>
+#include <language/qualifiedid.h>
#include <logging/logger.h>
#include <tools/set.h>
#include <tools/setupprojectparameters.h>
diff --git a/src/lib/corelib/language/projecttreebuilder.cpp b/src/lib/corelib/loader/projecttreebuilder.cpp
index 4667e8a1b..9c0209882 100644
--- a/src/lib/corelib/language/projecttreebuilder.cpp
+++ b/src/lib/corelib/loader/projecttreebuilder.cpp
@@ -39,22 +39,22 @@
#include "projecttreebuilder.h"
-#include "builtindeclarations.h"
-#include "evaluator.h"
-#include "filecontext.h"
-#include "filetags.h"
#include "groupshandler.h"
#include "itemreader.h"
-#include "language.h"
#include "localprofiles.h"
#include "moduleinstantiator.h"
#include "moduleloader.h"
#include "modulepropertymerger.h"
#include "probesresolver.h"
#include "productitemmultiplexer.h"
-#include "scriptengine.h"
-#include "value.h"
+#include <language/builtindeclarations.h>
+#include <language/evaluator.h>
+#include <language/filecontext.h>
+#include <language/filetags.h>
+#include <language/language.h>
+#include <language/scriptengine.h>
+#include <language/value.h>
#include <logging/categories.h>
#include <logging/translator.h>
#include <tools/fileinfo.h>
diff --git a/src/lib/corelib/language/projecttreebuilder.h b/src/lib/corelib/loader/projecttreebuilder.h
index 5f7869978..87111f730 100644
--- a/src/lib/corelib/language/projecttreebuilder.h
+++ b/src/lib/corelib/loader/projecttreebuilder.h
@@ -39,10 +39,11 @@
#pragma once
-#include "forward_decls.h"
-#include "moduleproviderinfo.h"
#include "moduleproviderloader.h"
-#include "qualifiedid.h"
+
+#include <language/forward_decls.h>
+#include <language/moduleproviderinfo.h>
+#include <language/qualifiedid.h>
#include <QString>
#include <QVariant>