diff --git a/share/qtcreator/qml-type-descriptions/qbs-bundle.json b/share/qtcreator/qml-type-descriptions/qbs-bundle.json
index 7f0c6886911..9b2f233a4c3 100644
--- a/share/qtcreator/qml-type-descriptions/qbs-bundle.json
+++ b/share/qtcreator/qml-type-descriptions/qbs-bundle.json
@@ -17,6 +17,7 @@
         "qbs.Environment",
         "qbs.File",
         "qbs.FileInfo",
+        "qbs.Host",
         "qbs.ModUtils",
         "qbs.PathTools",
         "qbs.PkgConfig",
diff --git a/src/libs/3rdparty/libptyqt/ptyqt.qbs b/src/libs/3rdparty/libptyqt/ptyqt.qbs
index 7ff4da9f560..40c920a59ce 100644
--- a/src/libs/3rdparty/libptyqt/ptyqt.qbs
+++ b/src/libs/3rdparty/libptyqt/ptyqt.qbs
@@ -1,45 +1,41 @@
-import qbs
-
-Project {
+QtcLibrary {
     name: "ptyqt"
 
-    QtcLibrary {
-        Depends { name: "Qt.core" }
-        Depends { name: "Qt.network"; condition: qbs.targetOS.contains("windows") }
-        Depends { name: "winpty"; condition: qbs.targetOS.contains("windows") }
+    Depends { name: "Qt.core" }
+    Depends { name: "Qt.network"; condition: qbs.targetOS.contains("windows") }
+    Depends { name: "winpty"; condition: qbs.targetOS.contains("windows") }
 
-        type: "staticlibrary"
+    type: "staticlibrary"
 
+    files: [
+        "iptyprocess.h",
+        "ptyqt.cpp",
+        "ptyqt.h",
+    ]
+
+    Group {
+        name: "ptyqt UNIX files"
+        condition: qbs.targetOS.contains("unix")
         files: [
-            "iptyprocess.h",
-            "ptyqt.cpp",
-            "ptyqt.h",
+            "unixptyprocess.cpp",
+            "unixptyprocess.h",
         ]
+    }
 
-        Group {
-            name: "ptyqt UNIX files"
-            condition: qbs.targetOS.contains("unix")
-            files: [
-                "unixptyprocess.cpp",
-                "unixptyprocess.h",
-            ]
-        }
+    Group {
+        name: "ptyqt Windows files"
+        condition: qbs.targetOS.contains("windows")
+        files: [
+            "conptyprocess.cpp",
+            "conptyprocess.h",
+            "winptyprocess.cpp",
+            "winptyprocess.h",
+        ]
+    }
 
-        Group {
-            name: "ptyqt Windows files"
-            condition: qbs.targetOS.contains("windows")
-            files: [
-                "conptyprocess.cpp",
-                "conptyprocess.h",
-                "winptyprocess.cpp",
-                "winptyprocess.h",
-            ]
-        }
-
-        Export {
-            Depends { name: "cpp" }
-            Depends { name: "winpty"; condition: qbs.targetOS.contains("windows") }
-            cpp.includePaths: base.concat(exportingProduct.sourceDirectory)
-        }
+    Export {
+        Depends { name: "cpp" }
+        Depends { name: "winpty"; condition: qbs.targetOS.contains("windows") }
+        cpp.includePaths: base.concat(exportingProduct.sourceDirectory)
     }
 }
diff --git a/src/libs/3rdparty/libvterm/vterm.qbs b/src/libs/3rdparty/libvterm/vterm.qbs
index 18ccb638aab..a1525879f53 100644
--- a/src/libs/3rdparty/libvterm/vterm.qbs
+++ b/src/libs/3rdparty/libvterm/vterm.qbs
@@ -1,34 +1,32 @@
-Project {
-    QtcLibrary {
-        name: "vterm"
-        type: "staticlibrary"
+QtcLibrary {
+    name: "vterm"
+    type: "staticlibrary"
 
+    Depends { name: "cpp" }
+    cpp.includePaths: base.concat("include")
+    cpp.warningLevel: "none"
+
+    Group {
+        prefix: "src/"
+        files: [
+            "encoding.c",
+            "fullwidth.inc",
+            "keyboard.c",
+            "mouse.c",
+            "parser.c",
+            "pen.c",
+            "rect.h",
+            "screen.c",
+            "state.c",
+            "unicode.c",
+            "utf8.h",
+            "vterm.c",
+            "vterm_internal.h",
+        ]
+    }
+
+    Export {
         Depends { name: "cpp" }
         cpp.includePaths: base.concat("include")
-        cpp.warningLevel: "none"
-
-        Group {
-            prefix: "src/"
-            files: [
-                "encoding.c",
-                "fullwidth.inc",
-                "keyboard.c",
-                "mouse.c",
-                "parser.c",
-                "pen.c",
-                "rect.h",
-                "screen.c",
-                "state.c",
-                "unicode.c",
-                "utf8.h",
-                "vterm.c",
-                "vterm_internal.h",
-            ]
-        }
-
-        Export {
-            Depends { name: "cpp" }
-            cpp.includePaths: base.concat("include")
-        }
     }
 }
diff --git a/src/libs/3rdparty/yaml-cpp/yaml-cpp.qbs b/src/libs/3rdparty/yaml-cpp/yaml-cpp.qbs
index 8685f6842d5..acf111798f7 100644
--- a/src/libs/3rdparty/yaml-cpp/yaml-cpp.qbs
+++ b/src/libs/3rdparty/yaml-cpp/yaml-cpp.qbs
@@ -1,106 +1,102 @@
-import qbs 1.0
+QtcLibrary {
+    name: "yaml-cpp"
 
-Project {
-    QtcLibrary {
-        name: "yaml-cpp"
+    cpp.defines: base.concat(["YAML_CPP_DLL", "yaml_cpp_EXPORTS"])
+    cpp.includePaths: [product.sourceDirectory + "/include/"]
 
-        cpp.defines: base.concat(["YAML_CPP_DLL", "yaml_cpp_EXPORTS"])
-        cpp.includePaths: [product.sourceDirectory + "/include/"]
+    files: [
+        "include/yaml-cpp/anchor.h",
+        "include/yaml-cpp/binary.h",
+        "include/yaml-cpp/depthguard.h",
+        "include/yaml-cpp/dll.h",
+        "include/yaml-cpp/emitfromevents.h",
+        "include/yaml-cpp/emitter.h",
+        "include/yaml-cpp/emitterdef.h",
+        "include/yaml-cpp/emittermanip.h",
+        "include/yaml-cpp/emitterstyle.h",
+        "include/yaml-cpp/eventhandler.h",
+        "include/yaml-cpp/exceptions.h",
+        "include/yaml-cpp/mark.h",
+        "include/yaml-cpp/noexcept.h",
+        "include/yaml-cpp/node",
+        "include/yaml-cpp/node/convert.h",
+        "include/yaml-cpp/node/detail",
+        "include/yaml-cpp/node/detail/impl.h",
+        "include/yaml-cpp/node/detail/iterator.h",
+        "include/yaml-cpp/node/detail/iterator_fwd.h",
+        "include/yaml-cpp/node/detail/memory.h",
+        "include/yaml-cpp/node/detail/node.h",
+        "include/yaml-cpp/node/detail/node_data.h",
+        "include/yaml-cpp/node/detail/node_iterator.h",
+        "include/yaml-cpp/node/detail/node_ref.h",
+        "include/yaml-cpp/node/emit.h",
+        "include/yaml-cpp/node/impl.h",
+        "include/yaml-cpp/node/iterator.h",
+        "include/yaml-cpp/node/node.h",
+        "include/yaml-cpp/node/parse.h",
+        "include/yaml-cpp/node/ptr.h",
+        "include/yaml-cpp/node/type.h",
+        "include/yaml-cpp/null.h",
+        "include/yaml-cpp/ostream_wrapper.h",
+        "include/yaml-cpp/parser.h",
+        "include/yaml-cpp/stlemitter.h",
+        "include/yaml-cpp/traits.h",
+        "include/yaml-cpp/yaml.h",
+        "src/binary.cpp",
+        "src/collectionstack.h",
+        "src/convert.cpp",
+        "src/depthguard.cpp",
+        "src/directives.cpp",
+        "src/directives.h",
+        "src/emit.cpp",
+        "src/emitfromevents.cpp",
+        "src/emitter.cpp",
+        "src/emitterstate.cpp",
+        "src/emitterstate.h",
+        "src/emitterutils.cpp",
+        "src/emitterutils.h",
+        "src/exceptions.cpp",
+        "src/exp.cpp",
+        "src/exp.h",
+        "src/indentation.h",
+        "src/memory.cpp",
+        "src/node.cpp",
+        "src/node_data.cpp",
+        "src/nodebuilder.cpp",
+        "src/nodebuilder.h",
+        "src/nodeevents.cpp",
+        "src/nodeevents.h",
+        "src/null.cpp",
+        "src/ostream_wrapper.cpp",
+        "src/parse.cpp",
+        "src/parser.cpp",
+        "src/ptr_vector.h",
+        "src/regex_yaml.cpp",
+        "src/regex_yaml.h",
+        "src/regeximpl.h",
+        "src/scanner.cpp",
+        "src/scanner.h",
+        "src/scanscalar.cpp",
+        "src/scanscalar.h",
+        "src/scantag.cpp",
+        "src/scantag.h",
+        "src/scantoken.cpp",
+        "src/setting.h",
+        "src/simplekey.cpp",
+        "src/singledocparser.cpp",
+        "src/singledocparser.h",
+        "src/stream.cpp",
+        "src/stream.h",
+        "src/streamcharsource.h",
+        "src/stringsource.h",
+        "src/tag.cpp",
+        "src/tag.h",
+        "src/token.h",
+    ]
 
-        files: [
-            "include/yaml-cpp/anchor.h",
-            "include/yaml-cpp/binary.h",
-            "include/yaml-cpp/depthguard.h",
-            "include/yaml-cpp/dll.h",
-            "include/yaml-cpp/emitfromevents.h",
-            "include/yaml-cpp/emitter.h",
-            "include/yaml-cpp/emitterdef.h",
-            "include/yaml-cpp/emittermanip.h",
-            "include/yaml-cpp/emitterstyle.h",
-            "include/yaml-cpp/eventhandler.h",
-            "include/yaml-cpp/exceptions.h",
-            "include/yaml-cpp/mark.h",
-            "include/yaml-cpp/noexcept.h",
-            "include/yaml-cpp/node",
-            "include/yaml-cpp/node/convert.h",
-            "include/yaml-cpp/node/detail",
-            "include/yaml-cpp/node/detail/impl.h",
-            "include/yaml-cpp/node/detail/iterator.h",
-            "include/yaml-cpp/node/detail/iterator_fwd.h",
-            "include/yaml-cpp/node/detail/memory.h",
-            "include/yaml-cpp/node/detail/node.h",
-            "include/yaml-cpp/node/detail/node_data.h",
-            "include/yaml-cpp/node/detail/node_iterator.h",
-            "include/yaml-cpp/node/detail/node_ref.h",
-            "include/yaml-cpp/node/emit.h",
-            "include/yaml-cpp/node/impl.h",
-            "include/yaml-cpp/node/iterator.h",
-            "include/yaml-cpp/node/node.h",
-            "include/yaml-cpp/node/parse.h",
-            "include/yaml-cpp/node/ptr.h",
-            "include/yaml-cpp/node/type.h",
-            "include/yaml-cpp/null.h",
-            "include/yaml-cpp/ostream_wrapper.h",
-            "include/yaml-cpp/parser.h",
-            "include/yaml-cpp/stlemitter.h",
-            "include/yaml-cpp/traits.h",
-            "include/yaml-cpp/yaml.h",
-            "src/binary.cpp",
-            "src/collectionstack.h",
-            "src/convert.cpp",
-            "src/depthguard.cpp",
-            "src/directives.cpp",
-            "src/directives.h",
-            "src/emit.cpp",
-            "src/emitfromevents.cpp",
-            "src/emitter.cpp",
-            "src/emitterstate.cpp",
-            "src/emitterstate.h",
-            "src/emitterutils.cpp",
-            "src/emitterutils.h",
-            "src/exceptions.cpp",
-            "src/exp.cpp",
-            "src/exp.h",
-            "src/indentation.h",
-            "src/memory.cpp",
-            "src/node.cpp",
-            "src/node_data.cpp",
-            "src/nodebuilder.cpp",
-            "src/nodebuilder.h",
-            "src/nodeevents.cpp",
-            "src/nodeevents.h",
-            "src/null.cpp",
-            "src/ostream_wrapper.cpp",
-            "src/parse.cpp",
-            "src/parser.cpp",
-            "src/ptr_vector.h",
-            "src/regex_yaml.cpp",
-            "src/regex_yaml.h",
-            "src/regeximpl.h",
-            "src/scanner.cpp",
-            "src/scanner.h",
-            "src/scanscalar.cpp",
-            "src/scanscalar.h",
-            "src/scantag.cpp",
-            "src/scantag.h",
-            "src/scantoken.cpp",
-            "src/setting.h",
-            "src/simplekey.cpp",
-            "src/singledocparser.cpp",
-            "src/singledocparser.h",
-            "src/stream.cpp",
-            "src/stream.h",
-            "src/streamcharsource.h",
-            "src/stringsource.h",
-            "src/tag.cpp",
-            "src/tag.h",
-            "src/token.h",
-        ]
-
-        Export {
-            Depends { name: "cpp" }
-            cpp.includePaths: [exportingProduct.sourceDirectory + "/include/"]
-            cpp.defines: base.concat(["YAML_CPP_DLL"])
-        }
+    Export {
+        Depends { name: "cpp" }
+        cpp.includePaths: [exportingProduct.sourceDirectory + "/include/"]
+        cpp.defines: base.concat(["YAML_CPP_DLL"])
     }
 }
diff --git a/src/libs/aggregation/aggregation.qbs b/src/libs/aggregation/aggregation.qbs
index d8f1097f756..873294e92f5 100644
--- a/src/libs/aggregation/aggregation.qbs
+++ b/src/libs/aggregation/aggregation.qbs
@@ -1,17 +1,12 @@
-import qbs 1.0
-
-Project {
+QtcLibrary {
     name: "Aggregation"
+    Depends { name: "Qt.core" }
+    cpp.defines: base.concat("AGGREGATION_LIBRARY")
 
-    QtcLibrary {
-        Depends { name: "Qt.core" }
-        cpp.defines: base.concat("AGGREGATION_LIBRARY")
-
-        files: [
-            "aggregate.cpp",
-            "aggregate.h",
-            "aggregation_global.h",
-        ]
-    }
+    files: [
+        "aggregate.cpp",
+        "aggregate.h",
+        "aggregation_global.h",
+    ]
 }
 
diff --git a/src/libs/cplusplus/cplusplus.qbs b/src/libs/cplusplus/cplusplus.qbs
index b774618f75c..7e230504530 100644
--- a/src/libs/cplusplus/cplusplus.qbs
+++ b/src/libs/cplusplus/cplusplus.qbs
@@ -1,135 +1,131 @@
-import qbs 1.0
-
-Project {
+QtcLibrary {
     name: "CPlusPlus"
 
-    QtcLibrary {
-        cpp.includePaths: base.concat("../3rdparty")
-        cpp.defines: base.concat([
-            "NDEBUG",
-            "CPLUSPLUS_BUILD_LIB"
-        ])
-        cpp.optimization: "fast"
+    cpp.includePaths: base.concat("../3rdparty")
+    cpp.defines: base.concat([
+                                 "NDEBUG",
+                                 "CPLUSPLUS_BUILD_LIB"
+                             ])
+    cpp.optimization: "fast"
 
-        Depends { name: "Qt.widgets" }
-        Depends { name: "Utils" }
+    Depends { name: "Qt.widgets" }
+    Depends { name: "Utils" }
 
-        Group {
-            name: "ThirdPartyCPlusPlus"
-            prefix: "../3rdparty/cplusplus/"
-            files: [
-                "AST.cpp",
-                "AST.h",
-                "ASTClone.cpp",
-                "ASTMatch0.cpp",
-                "ASTMatcher.cpp",
-                "ASTMatcher.h",
-                "ASTPatternBuilder.h",
-                "ASTVisit.cpp",
-                "ASTVisitor.cpp",
-                "ASTVisitor.h",
-                "ASTfwd.h",
-                "Bind.cpp",
-                "Bind.h",
-                "CPlusPlus.h",
-                "Control.cpp",
-                "Control.h",
-                "CoreTypes.cpp",
-                "CoreTypes.h",
-                "DiagnosticClient.cpp",
-                "DiagnosticClient.h",
-                "FullySpecifiedType.cpp",
-                "FullySpecifiedType.h",
-                "Keywords.cpp",
-                "Keywords.kwgen",
-                "Lexer.cpp",
-                "Lexer.h",
-                "LiteralTable.h",
-                "Literals.cpp",
-                "Literals.h",
-                "Matcher.cpp",
-                "Matcher.h",
-                "MemoryPool.cpp",
-                "MemoryPool.h",
-                "Name.cpp",
-                "Name.h",
-                "NameVisitor.cpp",
-                "NameVisitor.h",
-                "Names.cpp",
-                "Names.h",
-                "ObjectiveCAtKeywords.cpp",
-                "ObjectiveCTypeQualifiers.cpp",
-                "ObjectiveCTypeQualifiers.h",
-                "Parser.cpp",
-                "Parser.h",
-                "QtContextKeywords.cpp",
-                "QtContextKeywords.h",
-                "SafeMatcher.cpp",
-                "SafeMatcher.h",
-                "Scope.cpp",
-                "Scope.h",
-                "Symbol.cpp",
-                "Symbol.h",
-                "SymbolVisitor.h",
-                "Symbols.cpp",
-                "Symbols.h",
-                "Templates.cpp",
-                "Templates.h",
-                "Token.cpp",
-                "Token.h",
-                "TranslationUnit.cpp",
-                "TranslationUnit.h",
-                "Type.cpp",
-                "Type.h",
-                "TypeVisitor.cpp",
-                "TypeVisitor.h",
-            ]
-        }
+    Group {
+        name: "ThirdPartyCPlusPlus"
+        prefix: "../3rdparty/cplusplus/"
+        files: [
+            "AST.cpp",
+            "AST.h",
+            "ASTClone.cpp",
+            "ASTMatch0.cpp",
+            "ASTMatcher.cpp",
+            "ASTMatcher.h",
+            "ASTPatternBuilder.h",
+            "ASTVisit.cpp",
+            "ASTVisitor.cpp",
+            "ASTVisitor.h",
+            "ASTfwd.h",
+            "Bind.cpp",
+            "Bind.h",
+            "CPlusPlus.h",
+            "Control.cpp",
+            "Control.h",
+            "CoreTypes.cpp",
+            "CoreTypes.h",
+            "DiagnosticClient.cpp",
+            "DiagnosticClient.h",
+            "FullySpecifiedType.cpp",
+            "FullySpecifiedType.h",
+            "Keywords.cpp",
+            "Keywords.kwgen",
+            "Lexer.cpp",
+            "Lexer.h",
+            "LiteralTable.h",
+            "Literals.cpp",
+            "Literals.h",
+            "Matcher.cpp",
+            "Matcher.h",
+            "MemoryPool.cpp",
+            "MemoryPool.h",
+            "Name.cpp",
+            "Name.h",
+            "NameVisitor.cpp",
+            "NameVisitor.h",
+            "Names.cpp",
+            "Names.h",
+            "ObjectiveCAtKeywords.cpp",
+            "ObjectiveCTypeQualifiers.cpp",
+            "ObjectiveCTypeQualifiers.h",
+            "Parser.cpp",
+            "Parser.h",
+            "QtContextKeywords.cpp",
+            "QtContextKeywords.h",
+            "SafeMatcher.cpp",
+            "SafeMatcher.h",
+            "Scope.cpp",
+            "Scope.h",
+            "Symbol.cpp",
+            "Symbol.h",
+            "SymbolVisitor.h",
+            "Symbols.cpp",
+            "Symbols.h",
+            "Templates.cpp",
+            "Templates.h",
+            "Token.cpp",
+            "Token.h",
+            "TranslationUnit.cpp",
+            "TranslationUnit.h",
+            "Type.cpp",
+            "Type.h",
+            "TypeVisitor.cpp",
+            "TypeVisitor.h",
+        ]
+    }
 
-        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",
-                "cppmodelmanagerbase.cpp", "cppmodelmanagerbase.h",
-                "declarationcomments.cpp", "declarationcomments.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",
-                "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",
-                "findcdbbreakpoint.cpp", "findcdbbreakpoint.h",
-                "pp-cctype.h",
-                "pp-engine.cpp", "pp-engine.h",
-                "pp-scanner.cpp", "pp-scanner.h",
-                "pp.h",
-            ]
-        }
+    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",
+            "cppmodelmanagerbase.cpp", "cppmodelmanagerbase.h",
+            "declarationcomments.cpp", "declarationcomments.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",
+            "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",
+            "findcdbbreakpoint.cpp", "findcdbbreakpoint.h",
+            "pp-cctype.h",
+            "pp-engine.cpp", "pp-engine.h",
+            "pp-scanner.cpp", "pp-scanner.h",
+            "pp.h",
+        ]
+    }
 
-        Export {
-            cpp.includePaths: [
-                exportingProduct.sourceDirectory + "/../3rdparty"
-            ]
-        }
+    Export {
+        cpp.includePaths: [
+            exportingProduct.sourceDirectory + "/../3rdparty"
+        ]
     }
 }
diff --git a/src/libs/extensionsystem/extensionsystem.qbs b/src/libs/extensionsystem/extensionsystem.qbs
index 39e8cbc57c6..414060fd3ba 100644
--- a/src/libs/extensionsystem/extensionsystem.qbs
+++ b/src/libs/extensionsystem/extensionsystem.qbs
@@ -1,45 +1,41 @@
-import qbs 1.0
-
-Project {
+QtcLibrary {
     name: "ExtensionSystem"
 
-    QtcLibrary {
-        cpp.defines: base.concat([
-            "EXTENSIONSYSTEM_LIBRARY",
-            "IDE_TEST_DIR=\".\""
-        ])
+    cpp.defines: base.concat([
+                                 "EXTENSIONSYSTEM_LIBRARY",
+                                 "IDE_TEST_DIR=\".\""
+                             ])
 
-        Depends { name: "Qt"; submodules: ["core", "widgets"] }
-        Depends { name: "Aggregation" }
-        Depends { name: "Utils" }
+    Depends { name: "Qt"; submodules: ["core", "widgets"] }
+    Depends { name: "Aggregation" }
+    Depends { name: "Utils" }
 
-        files: [
-            "extensionsystem_global.h",
-            "extensionsystemtr.h",
-            "invoker.cpp",
-            "invoker.h",
-            "iplugin.cpp",
-            "iplugin.h",
-            "optionsparser.cpp",
-            "optionsparser.h",
-            "plugindetailsview.cpp",
-            "plugindetailsview.h",
-            "pluginerroroverview.cpp",
-            "pluginerroroverview.h",
-            "pluginerrorview.cpp",
-            "pluginerrorview.h",
-            "pluginmanager.cpp",
-            "pluginmanager.h",
-            "pluginmanager_p.h",
-            "pluginspec.cpp",
-            "pluginspec.h",
-            "pluginspec_p.h",
-            "pluginview.cpp",
-            "pluginview.h",
-        ]
+    files: [
+        "extensionsystem_global.h",
+        "extensionsystemtr.h",
+        "invoker.cpp",
+        "invoker.h",
+        "iplugin.cpp",
+        "iplugin.h",
+        "optionsparser.cpp",
+        "optionsparser.h",
+        "plugindetailsview.cpp",
+        "plugindetailsview.h",
+        "pluginerroroverview.cpp",
+        "pluginerroroverview.h",
+        "pluginerrorview.cpp",
+        "pluginerrorview.h",
+        "pluginmanager.cpp",
+        "pluginmanager.h",
+        "pluginmanager_p.h",
+        "pluginspec.cpp",
+        "pluginspec.h",
+        "pluginspec_p.h",
+        "pluginview.cpp",
+        "pluginview.h",
+    ]
 
-        Export {
-            Depends { name: "Qt.core" }
-        }
+    Export {
+        Depends { name: "Qt.core" }
     }
 }
diff --git a/src/libs/languageserverprotocol/languageserverprotocol.qbs b/src/libs/languageserverprotocol/languageserverprotocol.qbs
index 163b2d6d4ea..0368ceafee8 100644
--- a/src/libs/languageserverprotocol/languageserverprotocol.qbs
+++ b/src/libs/languageserverprotocol/languageserverprotocol.qbs
@@ -1,54 +1,50 @@
-import qbs 1.0
-
-Project {
+QtcLibrary {
     name: "LanguageServerProtocol"
 
-    QtcLibrary {
-        Depends { name: "Utils" }
-        cpp.defines: base.concat("LANGUAGESERVERPROTOCOL_LIBRARY")
+    Depends { name: "Utils" }
+    cpp.defines: base.concat("LANGUAGESERVERPROTOCOL_LIBRARY")
 
-        files: [
-            "basemessage.cpp",
-            "basemessage.h",
-            "callhierarchy.cpp",
-            "callhierarchy.h",
-            "client.cpp",
-            "client.h",
-            "clientcapabilities.cpp",
-            "clientcapabilities.h",
-            "completion.cpp",
-            "completion.h",
-            "diagnostics.cpp",
-            "diagnostics.h",
-            "initializemessages.cpp",
-            "initializemessages.h",
-            "jsonkeys.h",
-            "jsonobject.cpp",
-            "jsonobject.h",
-            "jsonrpcmessages.cpp",
-            "jsonrpcmessages.h",
-            "languagefeatures.cpp",
-            "languagefeatures.h",
-            "languageserverprotocol_global.h",
-            "languageserverprotocoltr.h",
-            "lsptypes.cpp",
-            "lsptypes.h",
-            "lsputils.cpp",
-            "lsputils.h",
-            "messages.cpp",
-            "messages.h",
-            "progresssupport.cpp",
-            "progresssupport.h",
-            "semantictokens.cpp",
-            "semantictokens.h",
-            "servercapabilities.cpp",
-            "servercapabilities.h",
-            "shutdownmessages.cpp",
-            "shutdownmessages.h",
-            "textsynchronization.cpp",
-            "textsynchronization.h",
-            "workspace.cpp",
-            "workspace.h",
-        ]
-    }
+    files: [
+        "basemessage.cpp",
+        "basemessage.h",
+        "callhierarchy.cpp",
+        "callhierarchy.h",
+        "client.cpp",
+        "client.h",
+        "clientcapabilities.cpp",
+        "clientcapabilities.h",
+        "completion.cpp",
+        "completion.h",
+        "diagnostics.cpp",
+        "diagnostics.h",
+        "initializemessages.cpp",
+        "initializemessages.h",
+        "jsonkeys.h",
+        "jsonobject.cpp",
+        "jsonobject.h",
+        "jsonrpcmessages.cpp",
+        "jsonrpcmessages.h",
+        "languagefeatures.cpp",
+        "languagefeatures.h",
+        "languageserverprotocol_global.h",
+        "languageserverprotocoltr.h",
+        "lsptypes.cpp",
+        "lsptypes.h",
+        "lsputils.cpp",
+        "lsputils.h",
+        "messages.cpp",
+        "messages.h",
+        "progresssupport.cpp",
+        "progresssupport.h",
+        "semantictokens.cpp",
+        "semantictokens.h",
+        "servercapabilities.cpp",
+        "servercapabilities.h",
+        "shutdownmessages.cpp",
+        "shutdownmessages.h",
+        "textsynchronization.cpp",
+        "textsynchronization.h",
+        "workspace.cpp",
+        "workspace.h",
+    ]
 }
diff --git a/src/libs/languageutils/languageutils.qbs b/src/libs/languageutils/languageutils.qbs
index 8b5d6a6e8ad..7a4cefd5ff3 100644
--- a/src/libs/languageutils/languageutils.qbs
+++ b/src/libs/languageutils/languageutils.qbs
@@ -1,20 +1,16 @@
-import qbs 1.0
-
-Project {
+QtcLibrary {
     name: "LanguageUtils"
 
-    QtcLibrary {
-        cpp.defines: base.concat(["LANGUAGEUTILS_LIBRARY"])
-        cpp.optimization: "fast"
+    cpp.defines: base.concat(["LANGUAGEUTILS_LIBRARY"])
+    cpp.optimization: "fast"
 
-        Depends { name: "Qt.core" }
+    Depends { name: "Qt.core" }
 
-        files: [
-            "componentversion.cpp",
-            "componentversion.h",
-            "fakemetaobject.cpp",
-            "fakemetaobject.h",
-            "languageutils_global.h",
-        ]
-    }
+    files: [
+        "componentversion.cpp",
+        "componentversion.h",
+        "fakemetaobject.cpp",
+        "fakemetaobject.h",
+        "languageutils_global.h",
+    ]
 }
diff --git a/src/libs/qmldebug/qmldebug.qbs b/src/libs/qmldebug/qmldebug.qbs
index bad5947682d..387f22b0aa0 100644
--- a/src/libs/qmldebug/qmldebug.qbs
+++ b/src/libs/qmldebug/qmldebug.qbs
@@ -1,40 +1,36 @@
-import qbs 1.0
-
-Project {
+QtcLibrary {
     name: "QmlDebug"
 
-    QtcLibrary {
-        cpp.defines: base.concat("QMLDEBUG_LIBRARY")
+    cpp.defines: base.concat("QMLDEBUG_LIBRARY")
 
-        Depends { name: "Qt"; submodules: ["gui", "network"] }
-        Depends { name: "Utils" }
+    Depends { name: "Qt"; submodules: ["gui", "network"] }
+    Depends { name: "Utils" }
 
-        files: [
-            "baseenginedebugclient.cpp",
-            "baseenginedebugclient.h",
-            "basetoolsclient.cpp",
-            "basetoolsclient.h",
-            "qdebugmessageclient.cpp",
-            "qdebugmessageclient.h",
-            "qmldebug_global.h",
-            "qmldebugtr.h",
-            "qmldebugclient.cpp",
-            "qmldebugclient.h",
-            "qmldebugcommandlinearguments.h",
-            "qmldebugconnection.cpp",
-            "qmldebugconnection.h",
-            "qmldebugconnectionmanager.cpp",
-            "qmldebugconnectionmanager.h",
-            "qmldebugconstants.h",
-            "qmlenginecontrolclient.cpp",
-            "qmlenginecontrolclient.h",
-            "qmlenginedebugclient.h",
-            "qmloutputparser.cpp",
-            "qmloutputparser.h",
-            "qmltoolsclient.cpp",
-            "qmltoolsclient.h",
-            "qpacketprotocol.cpp",
-            "qpacketprotocol.h",
-        ]
-    }
+    files: [
+        "baseenginedebugclient.cpp",
+        "baseenginedebugclient.h",
+        "basetoolsclient.cpp",
+        "basetoolsclient.h",
+        "qdebugmessageclient.cpp",
+        "qdebugmessageclient.h",
+        "qmldebug_global.h",
+        "qmldebugtr.h",
+        "qmldebugclient.cpp",
+        "qmldebugclient.h",
+        "qmldebugcommandlinearguments.h",
+        "qmldebugconnection.cpp",
+        "qmldebugconnection.h",
+        "qmldebugconnectionmanager.cpp",
+        "qmldebugconnectionmanager.h",
+        "qmldebugconstants.h",
+        "qmlenginecontrolclient.cpp",
+        "qmlenginecontrolclient.h",
+        "qmlenginedebugclient.h",
+        "qmloutputparser.cpp",
+        "qmloutputparser.h",
+        "qmltoolsclient.cpp",
+        "qmltoolsclient.h",
+        "qpacketprotocol.cpp",
+        "qpacketprotocol.h",
+    ]
 }
diff --git a/src/libs/qmljs/qmljs.qbs b/src/libs/qmljs/qmljs.qbs
index aa886a8ba2f..18434c83bad 100644
--- a/src/libs/qmljs/qmljs.qbs
+++ b/src/libs/qmljs/qmljs.qbs
@@ -1,83 +1,79 @@
-import qbs 1.0
-
-Project {
+QtcLibrary {
     name: "QmlJS"
 
-    QtcLibrary {
-        cpp.defines: base.concat(["QMLJS_LIBRARY"])
-        cpp.optimization: "fast"
+    cpp.defines: base.concat(["QMLJS_LIBRARY"])
+    cpp.optimization: "fast"
 
-        Depends { name: "ExtensionSystem" }
-        Depends { name: "Utils" }
-        Depends { name: "LanguageUtils" }
+    Depends { name: "ExtensionSystem" }
+    Depends { name: "Utils" }
+    Depends { name: "LanguageUtils" }
+    Depends { name: "CPlusPlus" }
+    Depends { name: "Qt"; submodules: ["widgets", "xml"] }
+
+    Group {
+        name: "General"
+        files: [
+            "jsoncheck.cpp", "jsoncheck.h",
+            "persistenttrie.cpp", "persistenttrie.h",
+            "qmljs_global.h",
+            "qmljsbind.cpp", "qmljsbind.h",
+            "qmljsbundle.cpp", "qmljsbundle.h",
+            "qmljscheck.cpp", "qmljscheck.h",
+            "qmljscodeformatter.cpp", "qmljscodeformatter.h",
+            "qmljscompletioncontextfinder.cpp", "qmljscompletioncontextfinder.h",
+            "qmljsconstants.h",
+            "qmljscontext.cpp", "qmljscontext.h",
+            "qmljsdocument.cpp", "qmljsdocument.h",
+            "qmljsevaluate.cpp", "qmljsevaluate.h",
+            "qmljsfindexportedcpptypes.cpp", "qmljsfindexportedcpptypes.h",
+            "qmljsicons.cpp", "qmljsicons.h",
+            "qmljsimportdependencies.cpp", "qmljsimportdependencies.h",
+            "qmljsindenter.cpp", "qmljsindenter.h",
+            "qmljsinterpreter.cpp", "qmljsinterpreter.h",
+            "qmljsdialect.cpp", "qmljsdialect.h",
+            "qmljslineinfo.cpp", "qmljslineinfo.h",
+            "qmljslink.cpp", "qmljslink.h",
+            "qmljsmodelmanagerinterface.cpp", "qmljsmodelmanagerinterface.h",
+            "qmljsplugindumper.cpp", "qmljsplugindumper.h",
+            "qmljspropertyreader.cpp", "qmljspropertyreader.h",
+            "qmljsreformatter.cpp", "qmljsreformatter.h",
+            "qmljsrewriter.cpp", "qmljsrewriter.h",
+            "qmljsscanner.cpp", "qmljsscanner.h",
+            "qmljsscopeastpath.cpp", "qmljsscopeastpath.h",
+            "qmljsscopebuilder.cpp", "qmljsscopebuilder.h",
+            "qmljsscopechain.cpp", "qmljsscopechain.h",
+            "qmljssimplereader.cpp", "qmljssimplereader.h",
+            "qmljsstaticanalysismessage.cpp", "qmljsstaticanalysismessage.h",
+            "qmljstr.h",
+            "qmljstypedescriptionreader.cpp", "qmljstypedescriptionreader.h",
+            "qmljsutils.cpp", "qmljsutils.h",
+            "qmljsvalueowner.cpp", "qmljsvalueowner.h",
+            "qmljsviewercontext.h"
+        ]
+    }
+
+    Group {
+        name: "Parser"
+        prefix: "parser/"
+        files: [
+            "qmldirparser.cpp", "qmldirparser_p.h",
+            "qmlimportresolver.cpp", "qmlimportresolver_p.h",
+            "qmljsast.cpp", "qmljsast_p.h",
+            "qmljsastfwd_p.h",
+            "qmljsastvisitor.cpp", "qmljsastvisitor_p.h",
+            "qmljsengine_p.h",
+            "qmljsglobal_p.h",
+            "qmljsgrammar.cpp", "qmljsgrammar_p.h",
+            "qmljskeywords_p.h",
+            "qmljslexer.cpp", "qmljslexer_p.h",
+            "qmljsmemorypool_p.h",
+            "qmljsparser.cpp", "qmljsparser_p.h",
+            "qmljssourcelocation_p.h",
+        ]
+    }
+
+    Export {
         Depends { name: "CPlusPlus" }
-        Depends { name: "Qt"; submodules: ["widgets", "xml"] }
-
-        Group {
-            name: "General"
-            files: [
-                "jsoncheck.cpp", "jsoncheck.h",
-                "persistenttrie.cpp", "persistenttrie.h",
-                "qmljs_global.h",
-                "qmljsbind.cpp", "qmljsbind.h",
-                "qmljsbundle.cpp", "qmljsbundle.h",
-                "qmljscheck.cpp", "qmljscheck.h",
-                "qmljscodeformatter.cpp", "qmljscodeformatter.h",
-                "qmljscompletioncontextfinder.cpp", "qmljscompletioncontextfinder.h",
-                "qmljsconstants.h",
-                "qmljscontext.cpp", "qmljscontext.h",
-                "qmljsdocument.cpp", "qmljsdocument.h",
-                "qmljsevaluate.cpp", "qmljsevaluate.h",
-                "qmljsfindexportedcpptypes.cpp", "qmljsfindexportedcpptypes.h",
-                "qmljsicons.cpp", "qmljsicons.h",
-                "qmljsimportdependencies.cpp", "qmljsimportdependencies.h",
-                "qmljsindenter.cpp", "qmljsindenter.h",
-                "qmljsinterpreter.cpp", "qmljsinterpreter.h",
-                "qmljsdialect.cpp", "qmljsdialect.h",
-                "qmljslineinfo.cpp", "qmljslineinfo.h",
-                "qmljslink.cpp", "qmljslink.h",
-                "qmljsmodelmanagerinterface.cpp", "qmljsmodelmanagerinterface.h",
-                "qmljsplugindumper.cpp", "qmljsplugindumper.h",
-                "qmljspropertyreader.cpp", "qmljspropertyreader.h",
-                "qmljsreformatter.cpp", "qmljsreformatter.h",
-                "qmljsrewriter.cpp", "qmljsrewriter.h",
-                "qmljsscanner.cpp", "qmljsscanner.h",
-                "qmljsscopeastpath.cpp", "qmljsscopeastpath.h",
-                "qmljsscopebuilder.cpp", "qmljsscopebuilder.h",
-                "qmljsscopechain.cpp", "qmljsscopechain.h",
-                "qmljssimplereader.cpp", "qmljssimplereader.h",
-                "qmljsstaticanalysismessage.cpp", "qmljsstaticanalysismessage.h",
-                "qmljstr.h",
-                "qmljstypedescriptionreader.cpp", "qmljstypedescriptionreader.h",
-                "qmljsutils.cpp", "qmljsutils.h",
-                "qmljsvalueowner.cpp", "qmljsvalueowner.h",
-                "qmljsviewercontext.h"
-            ]
-        }
-
-        Group {
-            name: "Parser"
-            prefix: "parser/"
-            files: [
-                "qmldirparser.cpp", "qmldirparser_p.h",
-                "qmlimportresolver.cpp", "qmlimportresolver_p.h",
-                "qmljsast.cpp", "qmljsast_p.h",
-                "qmljsastfwd_p.h",
-                "qmljsastvisitor.cpp", "qmljsastvisitor_p.h",
-                "qmljsengine_p.h",
-                "qmljsglobal_p.h",
-                "qmljsgrammar.cpp", "qmljsgrammar_p.h",
-                "qmljskeywords_p.h",
-                "qmljslexer.cpp", "qmljslexer_p.h",
-                "qmljsmemorypool_p.h",
-                "qmljsparser.cpp", "qmljsparser_p.h",
-                "qmljssourcelocation_p.h",
-            ]
-        }
-
-        Export {
-            Depends { name: "CPlusPlus" }
-            Depends { name: "LanguageUtils" }
-        }
+        Depends { name: "LanguageUtils" }
     }
 }
diff --git a/src/libs/tracing/tracing.qbs b/src/libs/tracing/tracing.qbs
index b71fe1f6057..d044800f846 100644
--- a/src/libs/tracing/tracing.qbs
+++ b/src/libs/tracing/tracing.qbs
@@ -1,52 +1,46 @@
-import qbs 1.0
-
-import QtcLibrary
-
-Project {
+QtcLibrary {
     name: "Tracing"
 
-    QtcLibrary {
-        Depends { name: "Qt"; submodules: ["qml", "quick", "gui"] }
-        Depends { name: "Qt.testlib"; condition: project.withAutotests }
-        Depends { name: "Utils" }
+    Depends { name: "Qt"; submodules: ["qml", "quick", "gui"] }
+    Depends { name: "Qt.testlib"; condition: project.withAutotests }
+    Depends { name: "Utils" }
 
-        Group {
-            name: "General"
-            files: [
-                "README",
-                "flamegraph.cpp", "flamegraph.h",
-                "flamegraphattached.h",
-                "safecastable.h",
-                "timelineabstractrenderer.cpp", "timelineabstractrenderer.h",
-                "timelineabstractrenderer_p.h",
-                "timelineformattime.cpp", "timelineformattime.h",
-                "timelineitemsrenderpass.cpp", "timelineitemsrenderpass.h",
-                "timelinemodel.cpp", "timelinemodel.h", "timelinemodel_p.h",
-                "timelinemodelaggregator.cpp", "timelinemodelaggregator.h",
-                "timelinenotesmodel.cpp", "timelinenotesmodel.h", "timelinenotesmodel_p.h",
-                "timelinenotesrenderpass.cpp", "timelinenotesrenderpass.h",
-                "timelineoverviewrenderer.cpp", "timelineoverviewrenderer.h",
-                "timelineoverviewrenderer_p.h",
-                "timelinerenderer.cpp", "timelinerenderer.h", "timelinerenderer_p.h",
-                "timelinerenderpass.cpp", "timelinerenderpass.h",
-                "timelinerenderstate.cpp", "timelinerenderstate.h", "timelinerenderstate_p.h",
-                "timelineselectionrenderpass.cpp", "timelineselectionrenderpass.h",
-                "timelinetheme.cpp", "timelinetheme.h",
-                "timelinetracefile.cpp", "timelinetracefile.h",
-                "timelinetracemanager.cpp", "timelinetracemanager.h",
-                "timelinezoomcontrol.cpp", "timelinezoomcontrol.h",
-                "traceevent.h", "traceeventtype.h", "tracestashfile.h",
-                "tracingtr.h",
-            ]
-        }
-
-        Group {
-            name: "Qml Files"
-            Qt.core.resourcePrefix: "qt/qml/QtCreator/Tracing/"
-            fileTags: "qt.core.resource_data"
-            files: "qml/**"
-        }
-
-        cpp.defines: base.concat("TRACING_LIBRARY")
+    Group {
+        name: "General"
+        files: [
+            "README",
+            "flamegraph.cpp", "flamegraph.h",
+            "flamegraphattached.h",
+            "safecastable.h",
+            "timelineabstractrenderer.cpp", "timelineabstractrenderer.h",
+            "timelineabstractrenderer_p.h",
+            "timelineformattime.cpp", "timelineformattime.h",
+            "timelineitemsrenderpass.cpp", "timelineitemsrenderpass.h",
+            "timelinemodel.cpp", "timelinemodel.h", "timelinemodel_p.h",
+            "timelinemodelaggregator.cpp", "timelinemodelaggregator.h",
+            "timelinenotesmodel.cpp", "timelinenotesmodel.h", "timelinenotesmodel_p.h",
+            "timelinenotesrenderpass.cpp", "timelinenotesrenderpass.h",
+            "timelineoverviewrenderer.cpp", "timelineoverviewrenderer.h",
+            "timelineoverviewrenderer_p.h",
+            "timelinerenderer.cpp", "timelinerenderer.h", "timelinerenderer_p.h",
+            "timelinerenderpass.cpp", "timelinerenderpass.h",
+            "timelinerenderstate.cpp", "timelinerenderstate.h", "timelinerenderstate_p.h",
+            "timelineselectionrenderpass.cpp", "timelineselectionrenderpass.h",
+            "timelinetheme.cpp", "timelinetheme.h",
+            "timelinetracefile.cpp", "timelinetracefile.h",
+            "timelinetracemanager.cpp", "timelinetracemanager.h",
+            "timelinezoomcontrol.cpp", "timelinezoomcontrol.h",
+            "traceevent.h", "traceeventtype.h", "tracestashfile.h",
+            "tracingtr.h",
+        ]
     }
+
+    Group {
+        name: "Qml Files"
+        Qt.core.resourcePrefix: "qt/qml/QtCreator/Tracing/"
+        fileTags: "qt.core.resource_data"
+        files: "qml/**"
+    }
+
+    cpp.defines: base.concat("TRACING_LIBRARY")
 }
diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs
index ba5665ab8f4..40a75de69e1 100644
--- a/src/libs/utils/utils.qbs
+++ b/src/libs/utils/utils.qbs
@@ -1,481 +1,475 @@
-import qbs 1.0
 import qbs.FileInfo
 
-Project {
+QtcLibrary {
     name: "Utils"
-
-    QtcLibrary {
-        cpp.includePaths: base.concat("mimetypes2", ".")
-        cpp.defines: base.concat([
-            "UTILS_LIBRARY"
-        ])
-        cpp.dynamicLibraries: {
-            var libs = [];
-            if (qbs.targetOS.contains("windows")) {
-                libs.push("user32", "iphlpapi", "ws2_32", "shell32", "ole32");
-                if (qbs.toolchainType === "mingw")
-                    libs.push("uuid");
-                else if (qbs.toolchainType === "msvc")
-                    libs.push("dbghelp");
-            } else if (qbs.targetOS.contains("unix")) {
-                if (!qbs.targetOS.contains("macos"))
-                    libs.push("X11");
-                if (!qbs.targetOS.contains("openbsd"))
-                    libs.push("pthread");
-            }
-            return libs;
+    cpp.includePaths: base.concat("mimetypes2", ".")
+    cpp.defines: base.concat(["UTILS_LIBRARY"])
+    cpp.dynamicLibraries: {
+        var libs = [];
+        if (qbs.targetOS.contains("windows")) {
+            libs.push("user32", "iphlpapi", "ws2_32", "shell32", "ole32");
+            if (qbs.toolchainType === "mingw")
+                libs.push("uuid");
+            else if (qbs.toolchainType === "msvc")
+                libs.push("dbghelp");
+        } else if (qbs.targetOS.contains("unix")) {
+            if (!qbs.targetOS.contains("macos"))
+                libs.push("X11");
+            if (!qbs.targetOS.contains("openbsd"))
+                libs.push("pthread");
         }
+        return libs;
+    }
 
-        cpp.enableExceptions: true
+    cpp.enableExceptions: true
 
-        Properties {
-            condition: qbs.targetOS.contains("macos")
-            cpp.frameworks: ["Foundation", "AppKit"]
-        }
+    Properties {
+        condition: qbs.targetOS.contains("macos")
+        cpp.frameworks: ["Foundation", "AppKit"]
+    }
 
-        Depends { name: "Qt"; submodules: ["concurrent", "core-private", "network", "qml", "widgets", "xml"] }
-        Depends { name: "Qt.macextras"; condition: Qt.core.versionMajor < 6 && qbs.targetOS.contains("macos") }
-        Depends { name: "Spinner" }
-        Depends { name: "Tasking" }
-        Depends { name: "ptyqt" }
+    Depends { name: "Qt"; submodules: ["concurrent", "core-private", "network", "qml", "widgets", "xml"] }
+    Depends { name: "Qt.macextras"; condition: Qt.core.versionMajor < 6 && qbs.targetOS.contains("macos") }
+    Depends { name: "Spinner" }
+    Depends { name: "Tasking" }
+    Depends { name: "ptyqt" }
 
+    files: [
+        "algorithm.h",
+        "ansiescapecodehandler.cpp",
+        "ansiescapecodehandler.h",
+        "appinfo.cpp",
+        "appinfo.h",
+        "appmainwindow.cpp",
+        "appmainwindow.h",
+        "aspects.cpp",
+        "aspects.h",
+        "async.cpp",
+        "async.h",
+        "basetreeview.cpp",
+        "basetreeview.h",
+        "benchmarker.cpp",
+        "benchmarker.h",
+        "buildablehelperlibrary.cpp",
+        "buildablehelperlibrary.h",
+        "camelcasecursor.cpp",
+        "camelcasecursor.h",
+        "categorysortfiltermodel.cpp",
+        "categorysortfiltermodel.h",
+        "changeset.cpp",
+        "changeset.h",
+        "checkablemessagebox.cpp",
+        "checkablemessagebox.h",
+        "clangutils.cpp",
+        "clangutils.h",
+        "classnamevalidatinglineedit.cpp",
+        "classnamevalidatinglineedit.h",
+        "codegeneration.cpp",
+        "codegeneration.h",
+        "commandline.cpp",
+        "commandline.h",
+        "completinglineedit.cpp",
+        "completinglineedit.h",
+        "completingtextedit.cpp",
+        "completingtextedit.h",
+        "cpplanguage_details.h",
+        "crumblepath.cpp",
+        "crumblepath.h",
+        "delegates.cpp",
+        "delegates.h",
+        "detailsbutton.cpp",
+        "detailsbutton.h",
+        "detailswidget.cpp",
+        "detailswidget.h",
+        "devicefileaccess.cpp",
+        "devicefileaccess.h",
+        "deviceshell.cpp",
+        "deviceshell.h",
+        "differ.cpp",
+        "differ.h",
+        "displayname.cpp",
+        "displayname.h",
+        "dropsupport.cpp",
+        "dropsupport.h",
+        "elfreader.cpp",
+        "elfreader.h",
+        "elidinglabel.cpp",
+        "elidinglabel.h",
+        "environment.cpp",
+        "environment.h",
+        "environmentdialog.cpp",
+        "environmentdialog.h",
+        "environmentmodel.cpp",
+        "environmentmodel.h",
+        "execmenu.cpp",
+        "execmenu.h",
+        "externalterminalprocessimpl.cpp",
+        "externalterminalprocessimpl.h",
+        "fadingindicator.cpp",
+        "fadingindicator.h",
+        "faketooltip.cpp",
+        "faketooltip.h",
+        "fancylineedit.cpp",
+        "fancylineedit.h",
+        "fancymainwindow.cpp",
+        "fancymainwindow.h",
+        "filecrumblabel.cpp",
+        "filecrumblabel.h",
+        "fileinprojectfinder.cpp",
+        "fileinprojectfinder.h",
+        "filenamevalidatinglineedit.cpp",
+        "filenamevalidatinglineedit.h",
+        "filepath.cpp",
+        "filepath.h",
+        "filesearch.cpp",
+        "filesearch.h",
+        "filestreamer.cpp",
+        "filestreamer.h",
+        "filestreamermanager.cpp",
+        "filestreamermanager.h",
+        "filesystemmodel.cpp",
+        "filesystemmodel.h",
+        "filesystemwatcher.cpp",
+        "filesystemwatcher.h",
+        "fileutils.cpp",
+        "fileutils.h",
+        "filewizardpage.cpp",
+        "filewizardpage.h",
+        "fixedsizeclicklabel.cpp",
+        "fixedsizeclicklabel.h",
+        "flowlayout.cpp",
+        "flowlayout.h",
+        "futuresynchronizer.cpp",
+        "futuresynchronizer.h",
+        "fuzzymatcher.cpp",
+        "fuzzymatcher.h",
+        "globalfilechangeblocker.cpp",
+        "globalfilechangeblocker.h",
+        "guard.cpp",
+        "guard.h",
+        "highlightingitemdelegate.cpp",
+        "highlightingitemdelegate.h",
+        "historycompleter.cpp",
+        "historycompleter.h",
+        "hostosinfo.h",
+        "hostosinfo.cpp",
+        "htmldocextractor.cpp",
+        "htmldocextractor.h",
+        "icon.cpp",
+        "icon.h",
+        "id.cpp",
+        "id.h",
+        "indexedcontainerproxyconstiterator.h",
+        "infobar.cpp",
+        "infobar.h",
+        "infolabel.cpp",
+        "infolabel.h",
+        "itemviews.cpp",
+        "itemviews.h",
+        "jsontreeitem.cpp",
+        "jsontreeitem.h",
+        "launcherinterface.cpp",
+        "launcherinterface.h",
+        "launcherpackets.cpp",
+        "launcherpackets.h",
+        "launchersocket.cpp",
+        "launchersocket.h",
+        "layoutbuilder.cpp",
+        "layoutbuilder.h",
+        "link.cpp",
+        "link.h",
+        "listmodel.h",
+        "listutils.h",
+        "macroexpander.cpp",
+        "macroexpander.h",
+        "mathutils.cpp",
+        "mathutils.h",
+        "mimeutils.h",
+        "minimizableinfobars.cpp",
+        "minimizableinfobars.h",
+        "multitextcursor.cpp",
+        "multitextcursor.h",
+        "namevaluedictionary.cpp",
+        "namevaluedictionary.h",
+        "namevalueitem.cpp",
+        "namevalueitem.h",
+        "namevaluemodel.cpp",
+        "namevaluemodel.h",
+        "namevaluesdialog.cpp",
+        "namevaluesdialog.h",
+        "namevaluevalidator.cpp",
+        "namevaluevalidator.h",
+        "navigationtreeview.cpp",
+        "navigationtreeview.h",
+        "networkaccessmanager.cpp",
+        "networkaccessmanager.h",
+        "optionpushbutton.h",
+        "optionpushbutton.cpp",
+        "osspecificaspects.h",
+        "outputformat.h",
+        "outputformatter.cpp",
+        "outputformatter.h",
+        "overlaywidget.cpp",
+        "overlaywidget.h",
+        "overridecursor.cpp",
+        "overridecursor.h",
+        "parameteraction.cpp",
+        "parameteraction.h",
+        "passworddialog.cpp",
+        "passworddialog.h",
+        "pathchooser.cpp",
+        "pathchooser.h",
+        "pathlisteditor.cpp",
+        "pathlisteditor.h",
+        "persistentcachestore.cpp",
+        "persistentcachestore.h",
+        "persistentsettings.cpp",
+        "persistentsettings.h",
+        "pointeralgorithm.h",
+        "port.cpp",
+        "port.h",
+        "portlist.cpp",
+        "portlist.h",
+        "predicates.h",
+        "process.cpp",
+        "process.h",
+        "processenums.h",
+        "processhandle.cpp",
+        "processhandle.h",
+        "processinfo.cpp",
+        "processinfo.h",
+        "processinterface.cpp",
+        "processinterface.h",
+        "processreaper.cpp",
+        "processreaper.h",
+        "processutils.cpp",
+        "processutils.h",
+        "progressindicator.cpp",
+        "progressindicator.h",
+        "projectintropage.cpp",
+        "projectintropage.h",
+        "proxyaction.cpp",
+        "proxyaction.h",
+        "qrcparser.cpp",
+        "qrcparser.h",
+        "qtcassert.cpp",
+        "qtcassert.h",
+        "qtcolorbutton.cpp",
+        "qtcolorbutton.h",
+        "qtcsettings.cpp",
+        "qtcsettings.h",
+        "reloadpromptutils.cpp",
+        "reloadpromptutils.h",
+        "removefiledialog.cpp",
+        "removefiledialog.h",
+        "savefile.cpp",
+        "savefile.h",
+        "scopedswap.h",
+        "scopedtimer.cpp",
+        "scopedtimer.h",
+        "searchresultitem.cpp",
+        "searchresultitem.h",
+        "set_algorithm.h",
+        "settingsaccessor.cpp",
+        "settingsaccessor.h",
+        "settingsselector.cpp",
+        "settingsselector.h",
+        "singleton.cpp",
+        "singleton.h",
+        "sizedarray.h",
+        "smallstring.h",
+        "smallstringiterator.h",
+        "smallstringio.h",
+        "smallstringliteral.h",
+        "smallstringlayout.h",
+        "smallstringmemory.h",
+        "smallstringvector.h",
+        "sortfiltermodel.h",
+        "span.h",
+        "../3rdparty/span/span.hpp",
+        "statuslabel.cpp",
+        "statuslabel.h",
+        "store.cpp",
+        "store.h",
+        "storekey.h",
+        "stringtable.cpp",
+        "stringtable.h",
+        "stringutils.cpp",
+        "stringutils.h",
+        "styleanimator.cpp",
+        "styleanimator.h",
+        "styledbar.cpp",
+        "styledbar.h",
+        "stylehelper.cpp",
+        "stylehelper.h",
+        "templateengine.cpp",
+        "templateengine.h",
+        "temporarydirectory.cpp",
+        "temporarydirectory.h",
+        "temporaryfile.cpp",
+        "temporaryfile.h",
+        "terminalcommand.cpp",
+        "terminalcommand.h",
+        "terminalhooks.cpp",
+        "terminalhooks.h",
+        "terminalinterface.cpp",
+        "terminalinterface.h",
+        "textfieldcheckbox.cpp",
+        "textfieldcheckbox.h",
+        "textfieldcombobox.cpp",
+        "textfieldcombobox.h",
+        "textfileformat.cpp",
+        "textfileformat.h",
+        "textutils.cpp",
+        "textutils.h",
+        "threadutils.cpp",
+        "threadutils.h",
+        "treemodel.cpp",
+        "treemodel.h",
+        "treeviewcombobox.cpp",
+        "treeviewcombobox.h",
+        "headerviewstretcher.cpp",
+        "headerviewstretcher.h",
+        "unarchiver.cpp",
+        "unarchiver.h",
+        "uncommentselection.cpp",
+        "uncommentselection.h",
+        "uniqueobjectptr.h",
+        "unixutils.cpp",
+        "unixutils.h",
+        "url.cpp",
+        "url.h",
+        "utils.qrc",
+        "utils_global.h",
+        "utilsicons.h",
+        "utilsicons.cpp",
+        "utilstr.h",
+        "variablechooser.cpp",
+        "variablechooser.h",
+        "winutils.cpp",
+        "winutils.h",
+        "wizard.cpp",
+        "wizard.h",
+        "wizardpage.cpp",
+        "wizardpage.h",
+        "images/*.png",
+    ]
+
+    Group {
+        name: "FSEngine"
+        prefix: "fsengine/"
+        cpp.defines: outer.concat("QTC_UTILS_WITH_FSENGINE")
         files: [
-            "algorithm.h",
-            "ansiescapecodehandler.cpp",
-            "ansiescapecodehandler.h",
-            "appinfo.cpp",
-            "appinfo.h",
-            "appmainwindow.cpp",
-            "appmainwindow.h",
-            "aspects.cpp",
-            "aspects.h",
-            "async.cpp",
-            "async.h",
-            "basetreeview.cpp",
-            "basetreeview.h",
-            "benchmarker.cpp",
-            "benchmarker.h",
-            "buildablehelperlibrary.cpp",
-            "buildablehelperlibrary.h",
-            "camelcasecursor.cpp",
-            "camelcasecursor.h",
-            "categorysortfiltermodel.cpp",
-            "categorysortfiltermodel.h",
-            "changeset.cpp",
-            "changeset.h",
-            "checkablemessagebox.cpp",
-            "checkablemessagebox.h",
-            "clangutils.cpp",
-            "clangutils.h",
-            "classnamevalidatinglineedit.cpp",
-            "classnamevalidatinglineedit.h",
-            "codegeneration.cpp",
-            "codegeneration.h",
-            "commandline.cpp",
-            "commandline.h",
-            "completinglineedit.cpp",
-            "completinglineedit.h",
-            "completingtextedit.cpp",
-            "completingtextedit.h",
-            "cpplanguage_details.h",
-            "crumblepath.cpp",
-            "crumblepath.h",
-            "delegates.cpp",
-            "delegates.h",
-            "detailsbutton.cpp",
-            "detailsbutton.h",
-            "detailswidget.cpp",
-            "detailswidget.h",
-            "devicefileaccess.cpp",
-            "devicefileaccess.h",
-            "deviceshell.cpp",
-            "deviceshell.h",
-            "differ.cpp",
-            "differ.h",
-            "displayname.cpp",
-            "displayname.h",
-            "dropsupport.cpp",
-            "dropsupport.h",
-            "elfreader.cpp",
-            "elfreader.h",
-            "elidinglabel.cpp",
-            "elidinglabel.h",
-            "environment.cpp",
-            "environment.h",
-            "environmentdialog.cpp",
-            "environmentdialog.h",
-            "environmentmodel.cpp",
-            "environmentmodel.h",
-            "execmenu.cpp",
-            "execmenu.h",
-            "externalterminalprocessimpl.cpp",
-            "externalterminalprocessimpl.h",
-            "fadingindicator.cpp",
-            "fadingindicator.h",
-            "faketooltip.cpp",
-            "faketooltip.h",
-            "fancylineedit.cpp",
-            "fancylineedit.h",
-            "fancymainwindow.cpp",
-            "fancymainwindow.h",
-            "filecrumblabel.cpp",
-            "filecrumblabel.h",
-            "fileinprojectfinder.cpp",
-            "fileinprojectfinder.h",
-            "filenamevalidatinglineedit.cpp",
-            "filenamevalidatinglineedit.h",
-            "filepath.cpp",
-            "filepath.h",
-            "filesearch.cpp",
-            "filesearch.h",
-            "filestreamer.cpp",
-            "filestreamer.h",
-            "filestreamermanager.cpp",
-            "filestreamermanager.h",
-            "filesystemmodel.cpp",
-            "filesystemmodel.h",
-            "filesystemwatcher.cpp",
-            "filesystemwatcher.h",
-            "fileutils.cpp",
-            "fileutils.h",
-            "filewizardpage.cpp",
-            "filewizardpage.h",
-            "fixedsizeclicklabel.cpp",
-            "fixedsizeclicklabel.h",
-            "flowlayout.cpp",
-            "flowlayout.h",
-            "futuresynchronizer.cpp",
-            "futuresynchronizer.h",
-            "fuzzymatcher.cpp",
-            "fuzzymatcher.h",
-            "globalfilechangeblocker.cpp",
-            "globalfilechangeblocker.h",
-            "guard.cpp",
-            "guard.h",
-            "highlightingitemdelegate.cpp",
-            "highlightingitemdelegate.h",
-            "historycompleter.cpp",
-            "historycompleter.h",
-            "hostosinfo.h",
-            "hostosinfo.cpp",
-            "htmldocextractor.cpp",
-            "htmldocextractor.h",
-            "icon.cpp",
-            "icon.h",
-            "id.cpp",
-            "id.h",
-            "indexedcontainerproxyconstiterator.h",
-            "infobar.cpp",
-            "infobar.h",
-            "infolabel.cpp",
-            "infolabel.h",
-            "itemviews.cpp",
-            "itemviews.h",
-            "jsontreeitem.cpp",
-            "jsontreeitem.h",
-            "launcherinterface.cpp",
-            "launcherinterface.h",
-            "launcherpackets.cpp",
-            "launcherpackets.h",
-            "launchersocket.cpp",
-            "launchersocket.h",
-            "layoutbuilder.cpp",
-            "layoutbuilder.h",
-            "link.cpp",
-            "link.h",
-            "listmodel.h",
-            "listutils.h",
-            "macroexpander.cpp",
-            "macroexpander.h",
-            "mathutils.cpp",
-            "mathutils.h",
-            "mimeutils.h",
-            "minimizableinfobars.cpp",
-            "minimizableinfobars.h",
-            "multitextcursor.cpp",
-            "multitextcursor.h",
-            "namevaluedictionary.cpp",
-            "namevaluedictionary.h",
-            "namevalueitem.cpp",
-            "namevalueitem.h",
-            "namevaluemodel.cpp",
-            "namevaluemodel.h",
-            "namevaluesdialog.cpp",
-            "namevaluesdialog.h",
-            "namevaluevalidator.cpp",
-            "namevaluevalidator.h",
-            "navigationtreeview.cpp",
-            "navigationtreeview.h",
-            "networkaccessmanager.cpp",
-            "networkaccessmanager.h",
-            "optionpushbutton.h",
-            "optionpushbutton.cpp",
-            "osspecificaspects.h",
-            "outputformat.h",
-            "outputformatter.cpp",
-            "outputformatter.h",
-            "overlaywidget.cpp",
-            "overlaywidget.h",
-            "overridecursor.cpp",
-            "overridecursor.h",
-            "parameteraction.cpp",
-            "parameteraction.h",
-            "passworddialog.cpp",
-            "passworddialog.h",
-            "pathchooser.cpp",
-            "pathchooser.h",
-            "pathlisteditor.cpp",
-            "pathlisteditor.h",
-            "persistentcachestore.cpp",
-            "persistentcachestore.h",
-            "persistentsettings.cpp",
-            "persistentsettings.h",
-            "pointeralgorithm.h",
-            "port.cpp",
-            "port.h",
-            "portlist.cpp",
-            "portlist.h",
-            "predicates.h",
-            "process.cpp",
-            "process.h",
-            "processenums.h",
-            "processhandle.cpp",
-            "processhandle.h",
-            "processinfo.cpp",
-            "processinfo.h",
-            "processinterface.cpp",
-            "processinterface.h",
-            "processreaper.cpp",
-            "processreaper.h",
-            "processutils.cpp",
-            "processutils.h",
-            "progressindicator.cpp",
-            "progressindicator.h",
-            "projectintropage.cpp",
-            "projectintropage.h",
-            "proxyaction.cpp",
-            "proxyaction.h",
-            "qrcparser.cpp",
-            "qrcparser.h",
-            "qtcassert.cpp",
-            "qtcassert.h",
-            "qtcolorbutton.cpp",
-            "qtcolorbutton.h",
-            "qtcsettings.cpp",
-            "qtcsettings.h",
-            "reloadpromptutils.cpp",
-            "reloadpromptutils.h",
-            "removefiledialog.cpp",
-            "removefiledialog.h",
-            "savefile.cpp",
-            "savefile.h",
-            "scopedswap.h",
-            "scopedtimer.cpp",
-            "scopedtimer.h",
-            "searchresultitem.cpp",
-            "searchresultitem.h",
-            "set_algorithm.h",
-            "settingsaccessor.cpp",
-            "settingsaccessor.h",
-            "settingsselector.cpp",
-            "settingsselector.h",
-            "singleton.cpp",
-            "singleton.h",
-            "sizedarray.h",
-            "smallstring.h",
-            "smallstringiterator.h",
-            "smallstringio.h",
-            "smallstringliteral.h",
-            "smallstringlayout.h",
-            "smallstringmemory.h",
-            "smallstringvector.h",
-            "sortfiltermodel.h",
-            "span.h",
-            "../3rdparty/span/span.hpp",
-            "statuslabel.cpp",
-            "statuslabel.h",
-            "store.cpp",
-            "store.h",
-            "storekey.h",
-            "stringtable.cpp",
-            "stringtable.h",
-            "stringutils.cpp",
-            "stringutils.h",
-            "styleanimator.cpp",
-            "styleanimator.h",
-            "styledbar.cpp",
-            "styledbar.h",
-            "stylehelper.cpp",
-            "stylehelper.h",
-            "templateengine.cpp",
-            "templateengine.h",
-            "temporarydirectory.cpp",
-            "temporarydirectory.h",
-            "temporaryfile.cpp",
-            "temporaryfile.h",
-            "terminalcommand.cpp",
-            "terminalcommand.h",
-            "terminalhooks.cpp",
-            "terminalhooks.h",
-            "terminalinterface.cpp",
-            "terminalinterface.h",
-            "textfieldcheckbox.cpp",
-            "textfieldcheckbox.h",
-            "textfieldcombobox.cpp",
-            "textfieldcombobox.h",
-            "textfileformat.cpp",
-            "textfileformat.h",
-            "textutils.cpp",
-            "textutils.h",
-            "threadutils.cpp",
-            "threadutils.h",
-            "treemodel.cpp",
-            "treemodel.h",
-            "treeviewcombobox.cpp",
-            "treeviewcombobox.h",
-            "headerviewstretcher.cpp",
-            "headerviewstretcher.h",
-            "unarchiver.cpp",
-            "unarchiver.h",
-            "uncommentselection.cpp",
-            "uncommentselection.h",
-            "uniqueobjectptr.h",
-            "unixutils.cpp",
-            "unixutils.h",
-            "url.cpp",
-            "url.h",
-            "utils.qrc",
-            "utils_global.h",
-            "utilsicons.h",
-            "utilsicons.cpp",
-            "utilstr.h",
-            "variablechooser.cpp",
-            "variablechooser.h",
-            "winutils.cpp",
-            "winutils.h",
-            "wizard.cpp",
-            "wizard.h",
-            "wizardpage.cpp",
-            "wizardpage.h",
-            "images/*.png",
+            "diriterator.h",
+            "fileiconprovider.cpp",
+            "fileiconprovider.h",
+            "fileiteratordevicesappender.h",
+            "fixedlistfsengine.h",
+            "fsengine.cpp",
+            "fsengine.h",
+            "fsenginehandler.cpp",
+            "fsenginehandler.h",
+            "fsengine_impl.cpp",
+            "fsengine_impl.h",
+            "rootinjectfsengine.h",
         ]
+    }
 
-        Group {
-            name: "FSEngine"
-            prefix: "fsengine/"
-            cpp.defines: outer.concat("QTC_UTILS_WITH_FSENGINE")
-            files: [
-                "diriterator.h",
-                "fileiconprovider.cpp",
-                "fileiconprovider.h",
-                "fileiteratordevicesappender.h",
-                "fixedlistfsengine.h",
-                "fsengine.cpp",
-                "fsengine.h",
-                "fsenginehandler.cpp",
-                "fsenginehandler.h",
-                "fsengine_impl.cpp",
-                "fsengine_impl.h",
-                "rootinjectfsengine.h",
-            ]
-        }
+    Group {
+        name: "Theme"
+        prefix: "theme/"
+        files: [
+            "theme.cpp",
+            "theme.h",
+            "theme_p.h",
+        ]
+    }
 
-        Group {
-            name: "Theme"
-            prefix: "theme/"
-            files: [
-                "theme.cpp",
-                "theme.h",
-                "theme_p.h",
-            ]
-        }
+    Group {
+        name: "Tooltip"
+        prefix: "tooltip/"
+        files: [
+            "effects.h",
+            "tips.cpp",
+            "tips.h",
+            "tooltip.cpp",
+            "tooltip.h",
+        ]
+    }
 
-        Group {
-            name: "Tooltip"
-            prefix: "tooltip/"
-            files: [
-                "effects.h",
-                "tips.cpp",
-                "tips.h",
-                "tooltip.cpp",
-                "tooltip.h",
-            ]
-        }
+    Group {
+        name: "FileUtils_macos"
+        condition: qbs.targetOS.contains("macos")
+        files: [
+            "fileutils_mac.h", "fileutils_mac.mm",
+        ]
+    }
 
+    Group {
+        name: "Theme_macos"
+        condition: qbs.targetOS.contains("macos")
+        prefix: "theme/"
+        files: [
+            "theme_mac.h", "theme_mac.mm",
+        ]
+    }
+
+    Group {
+        name: "ProcessHandle_macos"
+        condition: qbs.targetOS.contains("macos")
+        files: [
+            "processhandle_mac.mm",
+        ]
+    }
+
+    Group {
+        name: "MimeTypes"
+        prefix: "mimetypes2/"
+        files: [
+            "mimedatabase.cpp",
+            "mimedatabase.h",
+            "mimedatabase_p.h",
+            "mimeglobpattern.cpp",
+            "mimeglobpattern_p.h",
+            "mimemagicrule.cpp",
+            "mimemagicrule_p.h",
+            "mimemagicrulematcher.cpp",
+            "mimemagicrulematcher_p.h",
+            "mimeprovider.cpp",
+            "mimeprovider_p.h",
+            "mimetype.cpp",
+            "mimetype.h",
+            "mimetype_p.h",
+            "mimetypeparser.cpp",
+            "mimetypeparser_p.h",
+            "mimeutils.cpp"
+        ]
+    }
+
+    Group {
+        name: "TouchBar support"
+        prefix: "touchbar/"
+        files: "touchbar.h"
         Group {
-            name: "FileUtils_macos"
+            name: "TouchBar implementation"
             condition: qbs.targetOS.contains("macos")
             files: [
-                "fileutils_mac.h", "fileutils_mac.mm",
+                "touchbar_appdelegate_mac_p.h",
+                "touchbar_mac_p.h",
+                "touchbar_mac.mm",
+                "touchbar_appdelegate_mac.mm",
             ]
         }
-
         Group {
-            name: "Theme_macos"
-            condition: qbs.targetOS.contains("macos")
-            prefix: "theme/"
-            files: [
-                "theme_mac.h", "theme_mac.mm",
-            ]
-        }
-
-        Group {
-            name: "ProcessHandle_macos"
-            condition: qbs.targetOS.contains("macos")
-            files: [
-                "processhandle_mac.mm",
-            ]
-        }
-
-        Group {
-            name: "MimeTypes"
-            prefix: "mimetypes2/"
-            files: [
-                "mimedatabase.cpp",
-                "mimedatabase.h",
-                "mimedatabase_p.h",
-                "mimeglobpattern.cpp",
-                "mimeglobpattern_p.h",
-                "mimemagicrule.cpp",
-                "mimemagicrule_p.h",
-                "mimemagicrulematcher.cpp",
-                "mimemagicrulematcher_p.h",
-                "mimeprovider.cpp",
-                "mimeprovider_p.h",
-                "mimetype.cpp",
-                "mimetype.h",
-                "mimetype_p.h",
-                "mimetypeparser.cpp",
-                "mimetypeparser_p.h",
-                "mimeutils.cpp"
-            ]
-        }
-
-        Group {
-            name: "TouchBar support"
-            prefix: "touchbar/"
-            files: "touchbar.h"
-            Group {
-                name: "TouchBar implementation"
-                condition: qbs.targetOS.contains("macos")
-                files: [
-                    "touchbar_appdelegate_mac_p.h",
-                    "touchbar_mac_p.h",
-                    "touchbar_mac.mm",
-                    "touchbar_appdelegate_mac.mm",
-                ]
-            }
-            Group {
-                name: "TouchBar stub"
-                condition: !qbs.targetOS.contains("macos")
-                files: "touchbar.cpp"
-            }
-        }
-
-        Export {
-            Depends { name: "Qt"; submodules: ["concurrent", "widgets" ] }
-            Depends { name: "Tasking" }
-            cpp.includePaths: base.concat("mimetypes2")
+            name: "TouchBar stub"
+            condition: !qbs.targetOS.contains("macos")
+            files: "touchbar.cpp"
         }
     }
+
+    Export {
+        Depends { name: "Qt"; submodules: ["concurrent", "widgets" ] }
+        Depends { name: "Tasking" }
+        cpp.includePaths: base.concat("mimetypes2")
+    }
 }
diff --git a/src/plugins/android/android.qbs b/src/plugins/android/android.qbs
index a8fbd7c818a..81fd94bca76 100644
--- a/src/plugins/android/android.qbs
+++ b/src/plugins/android/android.qbs
@@ -1,126 +1,122 @@
-import qbs 1.0
-
-Project {
+QtcPlugin {
     name: "Android"
 
-    QtcPlugin {
-        Depends { name: "Qt"; submodules: ["widgets", "xml", "network"] }
-        Depends { name: "Core" }
-        Depends { name: "Debugger" }
-        Depends { name: "LanguageClient" }
-        Depends { name: "LanguageServerProtocol" }
-        Depends { name: "ProParser" }
-        Depends { name: "ProjectExplorer" }
-        Depends { name: "QmlDebug" }
-        Depends { name: "QtSupport" }
-        Depends { name: "TextEditor" }
-        Depends { name: "Utils" }
+    Depends { name: "Qt"; submodules: ["widgets", "xml", "network"] }
+    Depends { name: "Core" }
+    Depends { name: "Debugger" }
+    Depends { name: "LanguageClient" }
+    Depends { name: "LanguageServerProtocol" }
+    Depends { name: "ProParser" }
+    Depends { name: "ProjectExplorer" }
+    Depends { name: "QmlDebug" }
+    Depends { name: "QtSupport" }
+    Depends { name: "TextEditor" }
+    Depends { name: "Utils" }
 
+    files: [
+        "androidtr.h",
+        "android.qrc",
+        "androidavdmanager.cpp",
+        "androidavdmanager.h",
+        "androidconfigurations.cpp",
+        "androidconfigurations.h",
+        "androidconstants.h",
+        "androidcreatekeystorecertificate.cpp",
+        "androidcreatekeystorecertificate.h",
+        "androidbuildapkstep.cpp",
+        "androidbuildapkstep.h",
+        "androiddeployqtstep.cpp",
+        "androiddeployqtstep.h",
+        "androiddebugsupport.cpp",
+        "androiddebugsupport.h",
+        "androiddevice.cpp",
+        "androiddevice.h",
+        "androiddeviceinfo.cpp",
+        "androiddeviceinfo.h",
+        "androidextralibrarylistmodel.cpp",
+        "androidextralibrarylistmodel.h",
+        "androidglobal.h",
+        "androidmanager.cpp",
+        "androidmanager.h",
+        "androidmanifestdocument.cpp",
+        "androidmanifestdocument.h",
+        "androidmanifesteditor.cpp",
+        "androidmanifesteditor.h",
+        "androidmanifesteditoriconwidget.cpp",
+        "androidmanifesteditoriconwidget.h",
+        "androidmanifesteditoriconcontainerwidget.cpp",
+        "androidmanifesteditoriconcontainerwidget.h",
+        "androidmanifesteditorfactory.cpp",
+        "androidmanifesteditorfactory.h",
+        "androidmanifesteditorwidget.cpp",
+        "androidmanifesteditorwidget.h",
+        "androidpackageinstallationstep.cpp",
+        "androidpackageinstallationstep.h",
+        "androidplugin.cpp",
+        "androidplugin.h",
+        "androidpotentialkit.cpp",
+        "androidpotentialkit.h",
+        "androidqmlpreviewworker.h",
+        "androidqmlpreviewworker.cpp",
+        "androidqmltoolingsupport.cpp",
+        "androidqmltoolingsupport.h",
+        "androidqtversion.cpp",
+        "androidqtversion.h",
+        "androidrunconfiguration.cpp",
+        "androidrunconfiguration.h",
+        "androidruncontrol.cpp",
+        "androidruncontrol.h",
+        "androidrunner.cpp",
+        "androidrunner.h",
+        "androidrunnerworker.cpp",
+        "androidrunnerworker.h",
+        "androidsdkdownloader.cpp",
+        "androidsdkdownloader.h",
+        "androidsdkmanager.cpp",
+        "androidsdkmanager.h",
+        "androidsdkmanagerwidget.cpp",
+        "androidsdkmanagerwidget.h",
+        "androidsdkmodel.cpp",
+        "androidsdkmodel.h",
+        "androidsdkpackage.cpp",
+        "androidsdkpackage.h",
+        "androidsettingswidget.cpp",
+        "androidsettingswidget.h",
+        "androidsignaloperation.cpp",
+        "androidsignaloperation.h",
+        "androidtoolchain.cpp",
+        "androidtoolchain.h",
+        "avddialog.cpp",
+        "avddialog.h",
+        "avdmanageroutputparser.cpp",
+        "avdmanageroutputparser.h",
+        "certificatesmodel.cpp",
+        "certificatesmodel.h",
+        "createandroidmanifestwizard.h",
+        "createandroidmanifestwizard.cpp",
+        "javaeditor.cpp",
+        "javaeditor.h",
+        "javaindenter.cpp",
+        "javaindenter.h",
+        "javalanguageserver.cpp",
+        "javalanguageserver.h",
+        "javaparser.cpp",
+        "javaparser.h",
+        "splashscreencontainerwidget.cpp",
+        "splashscreencontainerwidget.h",
+        "splashscreenwidget.cpp",
+        "splashscreenwidget.h",
+        "sdkmanageroutputparser.cpp",
+        "sdkmanageroutputparser.h"
+    ]
+
+    QtcTestFiles {
         files: [
-            "androidtr.h",
-            "android.qrc",
-            "androidavdmanager.cpp",
-            "androidavdmanager.h",
-            "androidconfigurations.cpp",
-            "androidconfigurations.h",
-            "androidconstants.h",
-            "androidcreatekeystorecertificate.cpp",
-            "androidcreatekeystorecertificate.h",
-            "androidbuildapkstep.cpp",
-            "androidbuildapkstep.h",
-            "androiddeployqtstep.cpp",
-            "androiddeployqtstep.h",
-            "androiddebugsupport.cpp",
-            "androiddebugsupport.h",
-            "androiddevice.cpp",
-            "androiddevice.h",
-            "androiddeviceinfo.cpp",
-            "androiddeviceinfo.h",
-            "androidextralibrarylistmodel.cpp",
-            "androidextralibrarylistmodel.h",
-            "androidglobal.h",
-            "androidmanager.cpp",
-            "androidmanager.h",
-            "androidmanifestdocument.cpp",
-            "androidmanifestdocument.h",
-            "androidmanifesteditor.cpp",
-            "androidmanifesteditor.h",
-            "androidmanifesteditoriconwidget.cpp",
-            "androidmanifesteditoriconwidget.h",
-            "androidmanifesteditoriconcontainerwidget.cpp",
-            "androidmanifesteditoriconcontainerwidget.h",
-            "androidmanifesteditorfactory.cpp",
-            "androidmanifesteditorfactory.h",
-            "androidmanifesteditorwidget.cpp",
-            "androidmanifesteditorwidget.h",
-            "androidpackageinstallationstep.cpp",
-            "androidpackageinstallationstep.h",
-            "androidplugin.cpp",
-            "androidplugin.h",
-            "androidpotentialkit.cpp",
-            "androidpotentialkit.h",
-            "androidqmlpreviewworker.h",
-            "androidqmlpreviewworker.cpp",
-            "androidqmltoolingsupport.cpp",
-            "androidqmltoolingsupport.h",
-            "androidqtversion.cpp",
-            "androidqtversion.h",
-            "androidrunconfiguration.cpp",
-            "androidrunconfiguration.h",
-            "androidruncontrol.cpp",
-            "androidruncontrol.h",
-            "androidrunner.cpp",
-            "androidrunner.h",
-            "androidrunnerworker.cpp",
-            "androidrunnerworker.h",
-            "androidsdkdownloader.cpp",
-            "androidsdkdownloader.h",
-            "androidsdkmanager.cpp",
-            "androidsdkmanager.h",
-            "androidsdkmanagerwidget.cpp",
-            "androidsdkmanagerwidget.h",
-            "androidsdkmodel.cpp",
-            "androidsdkmodel.h",
-            "androidsdkpackage.cpp",
-            "androidsdkpackage.h",
-            "androidsettingswidget.cpp",
-            "androidsettingswidget.h",
-            "androidsignaloperation.cpp",
-            "androidsignaloperation.h",
-            "androidtoolchain.cpp",
-            "androidtoolchain.h",
-            "avddialog.cpp",
-            "avddialog.h",
-            "avdmanageroutputparser.cpp",
-            "avdmanageroutputparser.h",
-            "certificatesmodel.cpp",
-            "certificatesmodel.h",
-            "createandroidmanifestwizard.h",
-            "createandroidmanifestwizard.cpp",
-            "javaeditor.cpp",
-            "javaeditor.h",
-            "javaindenter.cpp",
-            "javaindenter.h",
-            "javalanguageserver.cpp",
-            "javalanguageserver.h",
-            "javaparser.cpp",
-            "javaparser.h",
-            "splashscreencontainerwidget.cpp",
-            "splashscreencontainerwidget.h",
-            "splashscreenwidget.cpp",
-            "splashscreenwidget.h",
-            "sdkmanageroutputparser.cpp",
-            "sdkmanageroutputparser.h"
+            "android_tst.qrc",
+            "androidsdkmanager_test.cpp",
+            "androidsdkmanager_test.h",
+            "sdkmanageroutputparser_test.cpp",
+            "sdkmanageroutputparser_test.h",
         ]
-
-        QtcTestFiles {
-            files: [
-                "android_tst.qrc",
-                "androidsdkmanager_test.cpp",
-                "androidsdkmanager_test.h",
-                "sdkmanageroutputparser_test.cpp",
-                "sdkmanageroutputparser_test.h",
-            ]
-        }
     }
 }
diff --git a/src/plugins/coreplugin/coreplugin.qbs b/src/plugins/coreplugin/coreplugin.qbs
index a95d22287db..bc4a27ff035 100644
--- a/src/plugins/coreplugin/coreplugin.qbs
+++ b/src/plugins/coreplugin/coreplugin.qbs
@@ -1,383 +1,379 @@
-import qbs 1.0
 import qbs.FileInfo
 import qbs.Utilities
 
-Project {
+QtcPlugin {
     name: "Core"
+    Depends {
+        name: "Qt"
+        submodules: ["widgets", "xml", "network", "qml", "sql", "printsupport"]
+    }
 
-    QtcPlugin {
-        Depends {
-            name: "Qt"
-            submodules: ["widgets", "xml", "network", "qml", "sql", "printsupport"]
-        }
+    Depends {
+        name: "Qt.gui-private"
+        condition: qbs.targetOS.contains("windows")
+    }
 
-        Depends {
-            name: "Qt.gui-private"
-            condition: qbs.targetOS.contains("windows")
-        }
+    Depends { name: "Utils" }
+    Depends { name: "Aggregation" }
+    Depends { name: "TerminalLib" }
 
-        Depends { name: "Utils" }
+    cpp.dynamicLibraries: {
+        if (qbs.targetOS.contains("windows"))
+            return ["ole32", "user32"]
+    }
+
+    cpp.frameworks: qbs.targetOS.contains("macos") ? ["AppKit"] : undefined
+
+    Group {
+        name: "General"
+        files: [
+            "actionsfilter.cpp",
+            "actionsfilter.h",
+            "basefilewizard.cpp",
+            "basefilewizard.h",
+            "basefilewizardfactory.cpp",
+            "basefilewizardfactory.h",
+            "core.qrc",
+            "core_global.h",
+            "coreconstants.h",
+            "coreicons.cpp",
+            "coreicons.h",
+            "corejsextensions.cpp",
+            "corejsextensions.h",
+            "coreplugin.cpp",
+            "coreplugin.h",
+            "coreplugintr.h",
+            "designmode.cpp",
+            "designmode.h",
+            "diffservice.cpp",
+            "diffservice.h",
+            "documentmanager.cpp",
+            "documentmanager.h",
+            "editmode.cpp",
+            "editmode.h",
+            "editortoolbar.cpp",
+            "editortoolbar.h",
+            "externaltool.cpp",
+            "externaltool.h",
+            "externaltoolmanager.cpp",
+            "externaltoolmanager.h",
+            "fancyactionbar.cpp",
+            "fancyactionbar.h",
+            "fancyactionbar.qrc",
+            "fancytabwidget.cpp",
+            "fancytabwidget.h",
+            "featureprovider.cpp",
+            "featureprovider.h",
+            "fileutils.cpp",
+            "fileutils.h",
+            "findplaceholder.cpp",
+            "findplaceholder.h",
+            "foldernavigationwidget.cpp",
+            "foldernavigationwidget.h",
+            "generalsettings.cpp",
+            "generalsettings.h",
+            "generatedfile.cpp",
+            "generatedfile.h",
+            "helpitem.cpp",
+            "helpitem.h",
+            "helpmanager.cpp",
+            "helpmanager.h",
+            "helpmanager_implementation.h",
+            "icontext.cpp",
+            "icontext.h",
+            "icore.cpp",
+            "icore.h",
+            "idocument.cpp",
+            "idocument.h",
+            "idocumentfactory.cpp",
+            "idocumentfactory.h",
+            "ifilewizardextension.h",
+            "imode.cpp",
+            "imode.h",
+            "inavigationwidgetfactory.cpp",
+            "inavigationwidgetfactory.h",
+            "ioutputpane.cpp",
+            "ioutputpane.h",
+            "iversioncontrol.cpp",
+            "iversioncontrol.h",
+            "iwelcomepage.cpp",
+            "iwelcomepage.h",
+            "iwizardfactory.cpp",
+            "iwizardfactory.h",
+            "jsexpander.cpp",
+            "jsexpander.h",
+            "loggingmanager.cpp",
+            "loggingmanager.h",
+            "loggingviewer.cpp",
+            "loggingviewer.h",
+            "mainwindow.cpp",
+            "mainwindow.h",
+            "manhattanstyle.cpp",
+            "manhattanstyle.h",
+            "messagebox.cpp",
+            "messagebox.h",
+            "messagemanager.cpp",
+            "messagemanager.h",
+            "messageoutputwindow.cpp",
+            "messageoutputwindow.h",
+            "mimetypemagicdialog.cpp",
+            "mimetypemagicdialog.h",
+            "mimetypesettings.cpp",
+            "mimetypesettings.h",
+            "minisplitter.cpp",
+            "minisplitter.h",
+            "modemanager.cpp",
+            "modemanager.h",
+            "navigationsubwidget.cpp",
+            "navigationsubwidget.h",
+            "navigationwidget.cpp",
+            "navigationwidget.h",
+            "opendocumentstreeview.cpp",
+            "opendocumentstreeview.h",
+            "outputpane.cpp",
+            "outputpane.h",
+            "outputpanemanager.cpp",
+            "outputpanemanager.h",
+            "outputwindow.cpp",
+            "outputwindow.h",
+            "patchtool.cpp",
+            "patchtool.h",
+            "plugindialog.cpp",
+            "plugindialog.h",
+            "plugininstallwizard.cpp",
+            "plugininstallwizard.h",
+            "rightpane.cpp",
+            "rightpane.h",
+            "session.cpp",
+            "session.h",
+            "sessiondialog.cpp",
+            "sessiondialog.h",
+            "sessionmodel.cpp",
+            "sessionmodel.h",
+            "sessionview.cpp",
+            "sessionview.h",
+            "settingsdatabase.cpp",
+            "settingsdatabase.h",
+            "sidebar.cpp",
+            "sidebar.h",
+            "sidebarwidget.cpp",
+            "sidebarwidget.h",
+            "statusbarmanager.cpp",
+            "statusbarmanager.h",
+            "systemsettings.cpp",
+            "systemsettings.h",
+            "textdocument.cpp",
+            "textdocument.h",
+            "themechooser.cpp",
+            "themechooser.h",
+            "vcsmanager.cpp",
+            "vcsmanager.h",
+            "versiondialog.cpp",
+            "versiondialog.h",
+            "welcomepagehelper.cpp",
+            "welcomepagehelper.h",
+            "windowsupport.cpp",
+            "windowsupport.h",
+        ]
+    }
+
+    Group {
+        name: "studiofonts"
+        prefix: "../../share/3rdparty/studiofonts/"
+        files: "studiofonts.qrc"
+    }
+
+    Group {
+        name: "Action Manager"
+        prefix: "actionmanager/"
+        files: [
+            "actioncontainer.cpp", "actioncontainer.h", "actioncontainer_p.h",
+            "actionmanager.cpp", "actionmanager.h", "actionmanager_p.h",
+            "command.cpp", "command.h", "command_p.h",
+            "commandbutton.cpp", "commandbutton.h",
+            "commandmappings.cpp", "commandmappings.h",
+            "commandsfile.cpp", "commandsfile.h",
+        ]
+    }
+
+    Group {
+        name: "Dialogs"
+        prefix: "dialogs/"
+        files: [
+            "addtovcsdialog.cpp", "addtovcsdialog.h",
+            "codecselector.cpp", "codecselector.h",
+            "externaltoolconfig.cpp", "externaltoolconfig.h",
+            "filepropertiesdialog.cpp", "filepropertiesdialog.h",
+            "ioptionspage.cpp", "ioptionspage.h",
+            "newdialog.cpp", "newdialog.h",
+            "newdialogwidget.cpp", "newdialogwidget.h",
+            "openwithdialog.cpp", "openwithdialog.h",
+            "promptoverwritedialog.cpp", "promptoverwritedialog.h",
+            "readonlyfilesdialog.cpp", "readonlyfilesdialog.h",
+            "restartdialog.cpp", "restartdialog.h",
+            "saveitemsdialog.cpp", "saveitemsdialog.h",
+            "settingsdialog.cpp", "settingsdialog.h",
+            "shortcutsettings.cpp", "shortcutsettings.h",
+        ]
+    }
+
+    Group {
+        name: "Editor Manager"
+        prefix: "editormanager/"
+        files: [
+            "documentmodel.cpp", "documentmodel.h", "documentmodel_p.h",
+            "editorarea.cpp", "editorarea.h",
+            "editormanager.cpp", "editormanager.h", "editormanager_p.h",
+            "editorview.cpp", "editorview.h",
+            "editorwindow.cpp", "editorwindow.h",
+            "ieditor.cpp", "ieditor.h",
+            "ieditorfactory.cpp", "ieditorfactory.h", "ieditorfactory_p.h",
+            "openeditorsview.cpp", "openeditorsview.h",
+            "openeditorswindow.cpp", "openeditorswindow.h",
+            "systemeditor.cpp", "systemeditor.h",
+        ]
+    }
+
+    Group {
+        name: "Progress Manager"
+        prefix: "progressmanager/"
+        files: [
+            "futureprogress.cpp", "futureprogress.h",
+            "processprogress.cpp", "processprogress.h",
+            "progressbar.cpp", "progressbar.h",
+            "progressmanager.cpp", "progressmanager.h", "progressmanager_p.h",
+            "progressview.cpp", "progressview.h",
+            "taskprogress.cpp", "taskprogress.h",
+        ]
+    }
+
+    Group {
+        name: "ProgressManager_win"
+        condition: qbs.targetOS.contains("windows")
+        files: [
+            "progressmanager/progressmanager_win.cpp",
+        ]
+    }
+
+    Group {
+        name: "ProgressManager_mac"
+        condition: qbs.targetOS.contains("macos")
+        files: [
+            "progressmanager/progressmanager_mac.mm",
+        ]
+    }
+
+    Group {
+        name: "ProgressManager_x11"
+        condition: qbs.targetOS.contains("unix") && !qbs.targetOS.contains("macos")
+        files: [
+            "progressmanager/progressmanager_x11.cpp",
+        ]
+    }
+
+    QtcTestFiles {
+        files: [
+            "testdatadir.cpp",
+            "testdatadir.h",
+            "locator/locatorfiltertest.cpp",
+            "locator/locatorfiltertest.h",
+            "locator/locator_test.cpp"
+        ]
+
+        cpp.defines: outer.concat(['SRCDIR="' + path + '"'])
+    }
+
+    Group {
+        name: "Find"
+        prefix: "find/"
+        files: [
+            "basetextfind.cpp",
+            "basetextfind.h",
+            "currentdocumentfind.cpp",
+            "currentdocumentfind.h",
+            "find.qrc",
+            "findplugin.cpp",
+            "findplugin.h",
+            "findtoolbar.cpp",
+            "findtoolbar.h",
+            "findtoolwindow.cpp",
+            "findtoolwindow.h",
+            "highlightscrollbarcontroller.cpp",
+            "highlightscrollbarcontroller.h",
+            "ifindfilter.cpp",
+            "ifindfilter.h",
+            "ifindsupport.cpp",
+            "ifindsupport.h",
+            "itemviewfind.cpp",
+            "itemviewfind.h",
+            "optionspopup.cpp",
+            "optionspopup.h",
+            "searchresulttreeitemdelegate.cpp",
+            "searchresulttreeitemdelegate.h",
+            "searchresulttreeitemroles.h",
+            "searchresulttreeitems.cpp",
+            "searchresulttreeitems.h",
+            "searchresulttreemodel.cpp",
+            "searchresulttreemodel.h",
+            "searchresulttreeview.cpp",
+            "searchresulttreeview.h",
+            "searchresultwidget.cpp",
+            "searchresultwidget.h",
+            "searchresultwindow.cpp",
+            "searchresultwindow.h",
+            "textfindconstants.h",
+        ]
+    }
+
+    Group {
+        name: "Locator"
+        prefix: "locator/"
+        files: [
+            "commandlocator.cpp",
+            "commandlocator.h",
+            "directoryfilter.cpp",
+            "directoryfilter.h",
+            "executefilter.cpp",
+            "executefilter.h",
+            "externaltoolsfilter.cpp",
+            "externaltoolsfilter.h",
+            "filesystemfilter.cpp",
+            "filesystemfilter.h",
+            "ilocatorfilter.cpp",
+            "ilocatorfilter.h",
+            "javascriptfilter.cpp",
+            "javascriptfilter.h",
+            "locatorconstants.h",
+            "locatorfiltersfilter.cpp",
+            "locatorfiltersfilter.h",
+            "locatormanager.cpp",
+            "locatormanager.h",
+            "locator.cpp",
+            "locator.h",
+            "locatorsettingspage.cpp",
+            "locatorsettingspage.h",
+            "locatorwidget.cpp",
+            "locatorwidget.h",
+            "opendocumentsfilter.cpp",
+            "opendocumentsfilter.h",
+            "spotlightlocatorfilter.h",
+            "spotlightlocatorfilter.cpp",
+            "urllocatorfilter.cpp",
+            "urllocatorfilter.h"
+        ]
+    }
+
+    Group {
+        name: "Terminal"
+        prefix: "terminal/"
+        files: [
+            "searchableterminal.cpp",
+            "searchableterminal.h",
+        ]
+    }
+
+    Export {
         Depends { name: "Aggregation" }
-        Depends { name: "TerminalLib" }
-
-        cpp.dynamicLibraries: {
-            if (qbs.targetOS.contains("windows"))
-                return ["ole32", "user32"]
-        }
-
-        cpp.frameworks: qbs.targetOS.contains("macos") ? ["AppKit"] : undefined
-
-        Group {
-            name: "General"
-            files: [
-                "actionsfilter.cpp",
-                "actionsfilter.h",
-                "basefilewizard.cpp",
-                "basefilewizard.h",
-                "basefilewizardfactory.cpp",
-                "basefilewizardfactory.h",
-                "core.qrc",
-                "core_global.h",
-                "coreconstants.h",
-                "coreicons.cpp",
-                "coreicons.h",
-                "corejsextensions.cpp",
-                "corejsextensions.h",
-                "coreplugin.cpp",
-                "coreplugin.h",
-                "coreplugintr.h",
-                "designmode.cpp",
-                "designmode.h",
-                "diffservice.cpp",
-                "diffservice.h",
-                "documentmanager.cpp",
-                "documentmanager.h",
-                "editmode.cpp",
-                "editmode.h",
-                "editortoolbar.cpp",
-                "editortoolbar.h",
-                "externaltool.cpp",
-                "externaltool.h",
-                "externaltoolmanager.cpp",
-                "externaltoolmanager.h",
-                "fancyactionbar.cpp",
-                "fancyactionbar.h",
-                "fancyactionbar.qrc",
-                "fancytabwidget.cpp",
-                "fancytabwidget.h",
-                "featureprovider.cpp",
-                "featureprovider.h",
-                "fileutils.cpp",
-                "fileutils.h",
-                "findplaceholder.cpp",
-                "findplaceholder.h",
-                "foldernavigationwidget.cpp",
-                "foldernavigationwidget.h",
-                "generalsettings.cpp",
-                "generalsettings.h",
-                "generatedfile.cpp",
-                "generatedfile.h",
-                "helpitem.cpp",
-                "helpitem.h",
-                "helpmanager.cpp",
-                "helpmanager.h",
-                "helpmanager_implementation.h",
-                "icontext.cpp",
-                "icontext.h",
-                "icore.cpp",
-                "icore.h",
-                "idocument.cpp",
-                "idocument.h",
-                "idocumentfactory.cpp",
-                "idocumentfactory.h",
-                "ifilewizardextension.h",
-                "imode.cpp",
-                "imode.h",
-                "inavigationwidgetfactory.cpp",
-                "inavigationwidgetfactory.h",
-                "ioutputpane.cpp",
-                "ioutputpane.h",
-                "iversioncontrol.cpp",
-                "iversioncontrol.h",
-                "iwelcomepage.cpp",
-                "iwelcomepage.h",
-                "iwizardfactory.cpp",
-                "iwizardfactory.h",
-                "jsexpander.cpp",
-                "jsexpander.h",
-                "loggingmanager.cpp",
-                "loggingmanager.h",
-                "loggingviewer.cpp",
-                "loggingviewer.h",
-                "mainwindow.cpp",
-                "mainwindow.h",
-                "manhattanstyle.cpp",
-                "manhattanstyle.h",
-                "messagebox.cpp",
-                "messagebox.h",
-                "messagemanager.cpp",
-                "messagemanager.h",
-                "messageoutputwindow.cpp",
-                "messageoutputwindow.h",
-                "mimetypemagicdialog.cpp",
-                "mimetypemagicdialog.h",
-                "mimetypesettings.cpp",
-                "mimetypesettings.h",
-                "minisplitter.cpp",
-                "minisplitter.h",
-                "modemanager.cpp",
-                "modemanager.h",
-                "navigationsubwidget.cpp",
-                "navigationsubwidget.h",
-                "navigationwidget.cpp",
-                "navigationwidget.h",
-                "opendocumentstreeview.cpp",
-                "opendocumentstreeview.h",
-                "outputpane.cpp",
-                "outputpane.h",
-                "outputpanemanager.cpp",
-                "outputpanemanager.h",
-                "outputwindow.cpp",
-                "outputwindow.h",
-                "patchtool.cpp",
-                "patchtool.h",
-                "plugindialog.cpp",
-                "plugindialog.h",
-                "plugininstallwizard.cpp",
-                "plugininstallwizard.h",
-                "rightpane.cpp",
-                "rightpane.h",
-                "session.cpp",
-                "session.h",
-                "sessiondialog.cpp",
-                "sessiondialog.h",
-                "sessionmodel.cpp",
-                "sessionmodel.h",
-                "sessionview.cpp",
-                "sessionview.h",
-                "settingsdatabase.cpp",
-                "settingsdatabase.h",
-                "sidebar.cpp",
-                "sidebar.h",
-                "sidebarwidget.cpp",
-                "sidebarwidget.h",
-                "statusbarmanager.cpp",
-                "statusbarmanager.h",
-                "systemsettings.cpp",
-                "systemsettings.h",
-                "textdocument.cpp",
-                "textdocument.h",
-                "themechooser.cpp",
-                "themechooser.h",
-                "vcsmanager.cpp",
-                "vcsmanager.h",
-                "versiondialog.cpp",
-                "versiondialog.h",
-                "welcomepagehelper.cpp",
-                "welcomepagehelper.h",
-                "windowsupport.cpp",
-                "windowsupport.h",
-            ]
-        }
-
-        Group {
-            name: "studiofonts"
-            prefix: "../../share/3rdparty/studiofonts/"
-            files: "studiofonts.qrc"
-        }
-
-        Group {
-            name: "Action Manager"
-            prefix: "actionmanager/"
-            files: [
-                "actioncontainer.cpp", "actioncontainer.h", "actioncontainer_p.h",
-                "actionmanager.cpp", "actionmanager.h", "actionmanager_p.h",
-                "command.cpp", "command.h", "command_p.h",
-                "commandbutton.cpp", "commandbutton.h",
-                "commandmappings.cpp", "commandmappings.h",
-                "commandsfile.cpp", "commandsfile.h",
-            ]
-        }
-
-        Group {
-            name: "Dialogs"
-            prefix: "dialogs/"
-            files: [
-                "addtovcsdialog.cpp", "addtovcsdialog.h",
-                "codecselector.cpp", "codecselector.h",
-                "externaltoolconfig.cpp", "externaltoolconfig.h",
-                "filepropertiesdialog.cpp", "filepropertiesdialog.h",
-                "ioptionspage.cpp", "ioptionspage.h",
-                "newdialog.cpp", "newdialog.h",
-                "newdialogwidget.cpp", "newdialogwidget.h",
-                "openwithdialog.cpp", "openwithdialog.h",
-                "promptoverwritedialog.cpp", "promptoverwritedialog.h",
-                "readonlyfilesdialog.cpp", "readonlyfilesdialog.h",
-                "restartdialog.cpp", "restartdialog.h",
-                "saveitemsdialog.cpp", "saveitemsdialog.h",
-                "settingsdialog.cpp", "settingsdialog.h",
-                "shortcutsettings.cpp", "shortcutsettings.h",
-            ]
-        }
-
-        Group {
-            name: "Editor Manager"
-            prefix: "editormanager/"
-            files: [
-                "documentmodel.cpp", "documentmodel.h", "documentmodel_p.h",
-                "editorarea.cpp", "editorarea.h",
-                "editormanager.cpp", "editormanager.h", "editormanager_p.h",
-                "editorview.cpp", "editorview.h",
-                "editorwindow.cpp", "editorwindow.h",
-                "ieditor.cpp", "ieditor.h",
-                "ieditorfactory.cpp", "ieditorfactory.h", "ieditorfactory_p.h",
-                "openeditorsview.cpp", "openeditorsview.h",
-                "openeditorswindow.cpp", "openeditorswindow.h",
-                "systemeditor.cpp", "systemeditor.h",
-            ]
-        }
-
-        Group {
-            name: "Progress Manager"
-            prefix: "progressmanager/"
-            files: [
-                "futureprogress.cpp", "futureprogress.h",
-                "processprogress.cpp", "processprogress.h",
-                "progressbar.cpp", "progressbar.h",
-                "progressmanager.cpp", "progressmanager.h", "progressmanager_p.h",
-                "progressview.cpp", "progressview.h",
-                "taskprogress.cpp", "taskprogress.h",
-            ]
-        }
-
-        Group {
-            name: "ProgressManager_win"
-            condition: qbs.targetOS.contains("windows")
-            files: [
-                "progressmanager/progressmanager_win.cpp",
-            ]
-        }
-
-        Group {
-            name: "ProgressManager_mac"
-            condition: qbs.targetOS.contains("macos")
-            files: [
-                "progressmanager/progressmanager_mac.mm",
-            ]
-        }
-
-        Group {
-            name: "ProgressManager_x11"
-            condition: qbs.targetOS.contains("unix") && !qbs.targetOS.contains("macos")
-            files: [
-                "progressmanager/progressmanager_x11.cpp",
-            ]
-        }
-
-        QtcTestFiles {
-            files: [
-                "testdatadir.cpp",
-                "testdatadir.h",
-                "locator/locatorfiltertest.cpp",
-                "locator/locatorfiltertest.h",
-                "locator/locator_test.cpp"
-            ]
-
-            cpp.defines: outer.concat(['SRCDIR="' + path + '"'])
-        }
-
-        Group {
-            name: "Find"
-            prefix: "find/"
-            files: [
-                "basetextfind.cpp",
-                "basetextfind.h",
-                "currentdocumentfind.cpp",
-                "currentdocumentfind.h",
-                "find.qrc",
-                "findplugin.cpp",
-                "findplugin.h",
-                "findtoolbar.cpp",
-                "findtoolbar.h",
-                "findtoolwindow.cpp",
-                "findtoolwindow.h",
-                "highlightscrollbarcontroller.cpp",
-                "highlightscrollbarcontroller.h",
-                "ifindfilter.cpp",
-                "ifindfilter.h",
-                "ifindsupport.cpp",
-                "ifindsupport.h",
-                "itemviewfind.cpp",
-                "itemviewfind.h",
-                "optionspopup.cpp",
-                "optionspopup.h",
-                "searchresulttreeitemdelegate.cpp",
-                "searchresulttreeitemdelegate.h",
-                "searchresulttreeitemroles.h",
-                "searchresulttreeitems.cpp",
-                "searchresulttreeitems.h",
-                "searchresulttreemodel.cpp",
-                "searchresulttreemodel.h",
-                "searchresulttreeview.cpp",
-                "searchresulttreeview.h",
-                "searchresultwidget.cpp",
-                "searchresultwidget.h",
-                "searchresultwindow.cpp",
-                "searchresultwindow.h",
-                "textfindconstants.h",
-            ]
-        }
-
-        Group {
-            name: "Locator"
-            prefix: "locator/"
-            files: [
-                "commandlocator.cpp",
-                "commandlocator.h",
-                "directoryfilter.cpp",
-                "directoryfilter.h",
-                "executefilter.cpp",
-                "executefilter.h",
-                "externaltoolsfilter.cpp",
-                "externaltoolsfilter.h",
-                "filesystemfilter.cpp",
-                "filesystemfilter.h",
-                "ilocatorfilter.cpp",
-                "ilocatorfilter.h",
-                "javascriptfilter.cpp",
-                "javascriptfilter.h",
-                "locatorconstants.h",
-                "locatorfiltersfilter.cpp",
-                "locatorfiltersfilter.h",
-                "locatormanager.cpp",
-                "locatormanager.h",
-                "locator.cpp",
-                "locator.h",
-                "locatorsettingspage.cpp",
-                "locatorsettingspage.h",
-                "locatorwidget.cpp",
-                "locatorwidget.h",
-                "opendocumentsfilter.cpp",
-                "opendocumentsfilter.h",
-                "spotlightlocatorfilter.h",
-                "spotlightlocatorfilter.cpp",
-                "urllocatorfilter.cpp",
-                "urllocatorfilter.h"
-            ]
-        }
-
-        Group {
-            name: "Terminal"
-            prefix: "terminal/"
-            files: [
-                "searchableterminal.cpp",
-                "searchableterminal.h",
-            ]
-        }
-
-        Export {
-            Depends { name: "Aggregation" }
-            Depends { name: "Utils" }
-        }
+        Depends { name: "Utils" }
     }
 }
diff --git a/src/plugins/debugger/debugger.qbs b/src/plugins/debugger/debugger.qbs
index 7e42fecd57f..7ff685a63c5 100644
--- a/src/plugins/debugger/debugger.qbs
+++ b/src/plugins/debugger/debugger.qbs
@@ -1,270 +1,261 @@
-import qbs 1.0
-
-Project {
+QtcPlugin {
     name: "Debugger"
 
-    QtcPlugin {
-        Depends { name: "Qt"; submodules: ["widgets", "network"] }
-        Depends { name: "Aggregation" }
+    Depends { name: "Qt"; submodules: ["network", "widgets"] }
+
+    Depends { name: "Aggregation" }
+    Depends { name: "CPlusPlus" }
+    Depends { name: "LanguageUtils" }
+    Depends { name: "QmlDebug" }
+    Depends { name: "QmlJS" }
+    Depends { name: "Utils" }
+
+    Depends { name: "Core" }
+    Depends { name: "CppEditor" }
+    Depends { name: "ProjectExplorer" }
+    Depends { name: "QtSupport" }
+    Depends { name: "TextEditor" }
+
+    pluginRecommends: ["BinEditor"]
+    pluginTestDepends: ["QmakeProjectManager"]
+
+    cpp.includePaths: base.concat([project.sharedSourcesDir + "/registryaccess"])
+    cpp.enableExceptions: true
+
+    Group {
+        name: "General"
+        files: [
+            "breakhandler.cpp", "breakhandler.h",
+            "breakpoint.cpp", "breakpoint.h",
+            "commonoptionspage.cpp", "commonoptionspage.h",
+            "debugger.qrc",
+            "debugger_global.h", "debuggertr.h",
+            "debuggeractions.cpp", "debuggeractions.h",
+            "debuggerconstants.h",
+            "debuggericons.h", "debuggericons.cpp",
+            "debuggercore.h",
+            "debuggerdialogs.cpp", "debuggerdialogs.h",
+            "debuggerengine.cpp", "debuggerengine.h",
+            "debuggerinternalconstants.h",
+            "debuggeritem.cpp", "debuggeritem.h",
+            "debuggeritemmanager.cpp", "debuggeritemmanager.h",
+            "debuggerkitaspect.cpp", "debuggerkitaspect.h",
+            "debuggermainwindow.cpp", "debuggermainwindow.h",
+            "debuggerplugin.cpp", "debuggerplugin.h",
+            "debuggerprotocol.cpp", "debuggerprotocol.h",
+            "debuggerrunconfigurationaspect.cpp", "debuggerrunconfigurationaspect.h",
+            "debuggerruncontrol.cpp", "debuggerruncontrol.h",
+            "debuggersourcepathmappingwidget.cpp", "debuggersourcepathmappingwidget.h",
+            "debuggertooltipmanager.cpp", "debuggertooltipmanager.h",
+            "disassembleragent.cpp", "disassembleragent.h",
+            "disassemblerlines.cpp", "disassemblerlines.h",
+            "enginemanager.cpp", "enginemanager.h",
+            "imageviewer.cpp", "imageviewer.h",
+            "loadcoredialog.cpp", "loadcoredialog.h",
+            "localsandexpressionswindow.cpp", "localsandexpressionswindow.h",
+            "logwindow.cpp", "logwindow.h",
+            "memoryagent.cpp", "memoryagent.h",
+            "moduleshandler.cpp", "moduleshandler.h",
+            "outputcollector.cpp", "outputcollector.h",
+            "peripheralregisterhandler.cpp", "peripheralregisterhandler.h",
+            "procinterrupt.cpp", "procinterrupt.h",
+            "registerhandler.cpp", "registerhandler.h",
+            "sourceagent.cpp", "sourceagent.h",
+            "sourcefileshandler.cpp", "sourcefileshandler.h",
+            "sourceutils.cpp", "sourceutils.h",
+            "stackframe.cpp", "stackframe.h",
+            "stackhandler.cpp", "stackhandler.h",
+            "stackwindow.cpp", "stackwindow.h",
+            "terminal.cpp", "terminal.h",
+            "threaddata.h",
+            "threadshandler.cpp", "threadshandler.h",
+            "watchdata.cpp", "watchdata.h",
+            "watchdelegatewidgets.cpp", "watchdelegatewidgets.h",
+            "watchhandler.cpp", "watchhandler.h",
+            "watchutils.cpp", "watchutils.h",
+            "watchwindow.cpp", "watchwindow.h",
+            "simplifytype.cpp", "simplifytype.h",
+            "unstartedappwatcherdialog.cpp", "unstartedappwatcherdialog.h"
+        ]
+    }
+
+    Group {
+        name: "cdb"
+        prefix: "cdb/"
+        files: [
+            "cdbengine.cpp", "cdbengine.h",
+            "cdboptionspage.cpp", "cdboptionspage.h",
+            "cdbparsehelpers.cpp", "cdbparsehelpers.h",
+            "stringinputstream.cpp", "stringinputstream.h",
+        ]
+    }
+
+    Group {
+        name: "gdb"
+        prefix: "gdb/"
+        files: [
+            "gdbengine.cpp", "gdbengine.h",
+            "gdbsettings.cpp", "gdbsettings.h",
+        ]
+    }
+
+    Group {
+        name: "lldb"
+        prefix: "lldb/"
+        files: [
+            "lldbengine.cpp", "lldbengine.h"
+        ]
+    }
+
+    Group {
+        name: "pdb"
+        prefix: "pdb/"
+        files: ["pdbengine.cpp", "pdbengine.h"]
+    }
+
+    Group {
+        name: "dap"
+        prefix: "dap/"
+        files: [
+            "cmakedapengine.cpp", "cmakedapengine.h",
+            "dapclient.cpp", "dapclient.h",
+            "dapengine.cpp", "dapengine.h",
+            "gdbdapengine.cpp", "gdbdapengine.h",
+            "pydapengine.cpp", "pydapengine.h",
+        ]
+    }
+
+    Group {
+        name: "uvsc"
+        prefix: "uvsc/"
+        files: [
+            "uvscclient.cpp", "uvscclient.h",
+            "uvscdatatypes.h",
+            "uvscengine.cpp", "uvscengine.h",
+            "uvscfunctions.h",
+            "uvscutils.cpp", "uvscutils.h",
+        ]
+    }
+
+    Group {
+        name: "QML Debugger"
+        prefix: "qml/"
+        files: [
+            "interactiveinterpreter.cpp", "interactiveinterpreter.h",
+            "qmlengine.cpp", "qmlengine.h",
+            "qmlengineutils.cpp", "qmlengineutils.h",
+            "qmlinspectoragent.cpp", "qmlinspectoragent.h",
+            "qmlv8debuggerclientconstants.h"
+        ]
+    }
+
+    Group {
+        name: "Debugger Console"
+        prefix: "console/"
+        files: [
+            "consoleitem.cpp", "consoleitem.h",
+            "consoleedit.cpp", "consoleedit.h",
+            "consoleitemdelegate.cpp", "consoleitemdelegate.h",
+            "consoleitemmodel.cpp", "consoleitemmodel.h",
+            "console.cpp", "console.h",
+            "consoleproxymodel.cpp", "consoleproxymodel.h",
+            "consoleview.cpp", "consoleview.h"
+        ]
+    }
+
+    Group {
+        name: "shared"
+        prefix: "shared/"
+        files: [
+            "cdbsymbolpathlisteditor.cpp",
+            "cdbsymbolpathlisteditor.h",
+            "hostutils.cpp", "hostutils.h",
+            "peutils.cpp", "peutils.h",
+            "symbolpathsdialog.cpp", "symbolpathsdialog.h"
+        ]
+    }
+
+    Group {
+        name: "Images"
+        prefix: "images/"
+        files: ["*.png"]
+    }
+
+    Group {
+        name: "Images/qml"
+        prefix: "images/qml/"
+        files: ["*.png"]
+    }
+
+    Group {
+        name: "Images/analyzer"
+        prefix: "analyzer/images/"
+        files: ["*.png"]
+    }
+
+    Group {
+        name: "RegistryAccess"
+        condition: qbs.targetOS.contains("windows")
+        prefix: project.sharedSourcesDir + "/registryaccess/"
+        files: [
+            "registryaccess.cpp",
+            "registryaccess.h",
+        ]
+    }
+
+    Group {
+        name: "RegisterPostMortem"
+        condition: qbs.targetOS.contains("windows")
+        files: [
+            "registerpostmortemaction.cpp",
+            "registerpostmortemaction.h",
+        ]
+    }
+
+    Properties {
+        condition: qbs.targetOS.contains("windows")
+        cpp.dynamicLibraries: [
+            "advapi32",
+            "ole32",
+            "shell32"
+        ]
+    }
+
+    Group {
+        name: "Analyzer"
+        prefix: "analyzer/"
+        files: [
+            "analyzerbase.qrc",
+            "analyzerconstants.h",
+            "analyzericons.h",
+            "analyzermanager.h",
+            "analyzerrunconfigwidget.cpp",
+            "analyzerrunconfigwidget.h",
+            "analyzerutils.cpp",
+            "analyzerutils.h",
+            "detailederrorview.cpp",
+            "detailederrorview.h",
+            "diagnosticlocation.cpp",
+            "diagnosticlocation.h",
+            "startremotedialog.cpp",
+            "startremotedialog.h",
+        ]
+    }
+
+    QtcTestFiles {
+        files: [
+            "debuggerunittests.qrc",
+        ]
+    }
+
+    Group {
+        name: "Unit test resources"
+        prefix: "unit-tests/"
+        fileTags: []
+        files: ["**/*"]
+    }
+
+    Export {
         Depends { name: "CPlusPlus" }
-        Depends { name: "QmlDebug" }
-        Depends { name: "LanguageUtils" }
-        Depends { name: "QmlJS" }
-        Depends { name: "Utils" }
-
-        Depends { name: "Core" }
-        Depends { name: "CppEditor" }
-        Depends { name: "ProjectExplorer" }
-        Depends { name: "QtSupport" }
-        Depends { name: "TextEditor" }
-
-        pluginTestDepends: [
-            "QmakeProjectManager"
-        ]
-
-        cpp.includePaths: base.concat([project.sharedSourcesDir + "/registryaccess"])
-        cpp.enableExceptions: true
-
-        pluginRecommends: [
-            "CppEditor",
-            "BinEditor"
-        ]
-
-        Group {
-            name: "General"
-            files: [
-                "breakhandler.cpp", "breakhandler.h",
-                "breakpoint.cpp", "breakpoint.h",
-                "commonoptionspage.cpp", "commonoptionspage.h",
-                "debugger.qrc",
-                "debugger_global.h", "debuggertr.h",
-                "debuggeractions.cpp", "debuggeractions.h",
-                "debuggerconstants.h",
-                "debuggericons.h", "debuggericons.cpp",
-                "debuggercore.h",
-                "debuggerdialogs.cpp", "debuggerdialogs.h",
-                "debuggerengine.cpp", "debuggerengine.h",
-                "debuggerinternalconstants.h",
-                "debuggeritem.cpp", "debuggeritem.h",
-                "debuggeritemmanager.cpp", "debuggeritemmanager.h",
-                "debuggerkitaspect.cpp", "debuggerkitaspect.h",
-                "debuggermainwindow.cpp", "debuggermainwindow.h",
-                "debuggerplugin.cpp", "debuggerplugin.h",
-                "debuggerprotocol.cpp", "debuggerprotocol.h",
-                "debuggerrunconfigurationaspect.cpp", "debuggerrunconfigurationaspect.h",
-                "debuggerruncontrol.cpp", "debuggerruncontrol.h",
-                "debuggersourcepathmappingwidget.cpp", "debuggersourcepathmappingwidget.h",
-                "debuggertooltipmanager.cpp", "debuggertooltipmanager.h",
-                "disassembleragent.cpp", "disassembleragent.h",
-                "disassemblerlines.cpp", "disassemblerlines.h",
-                "enginemanager.cpp", "enginemanager.h",
-                "imageviewer.cpp", "imageviewer.h",
-                "loadcoredialog.cpp", "loadcoredialog.h",
-                "localsandexpressionswindow.cpp", "localsandexpressionswindow.h",
-                "logwindow.cpp", "logwindow.h",
-                "memoryagent.cpp", "memoryagent.h",
-                "moduleshandler.cpp", "moduleshandler.h",
-                "outputcollector.cpp", "outputcollector.h",
-                "peripheralregisterhandler.cpp", "peripheralregisterhandler.h",
-                "procinterrupt.cpp", "procinterrupt.h",
-                "registerhandler.cpp", "registerhandler.h",
-                "sourceagent.cpp", "sourceagent.h",
-                "sourcefileshandler.cpp", "sourcefileshandler.h",
-                "sourceutils.cpp", "sourceutils.h",
-                "stackframe.cpp", "stackframe.h",
-                "stackhandler.cpp", "stackhandler.h",
-                "stackwindow.cpp", "stackwindow.h",
-                "terminal.cpp", "terminal.h",
-                "threaddata.h",
-                "threadshandler.cpp", "threadshandler.h",
-                "watchdata.cpp", "watchdata.h",
-                "watchdelegatewidgets.cpp", "watchdelegatewidgets.h",
-                "watchhandler.cpp", "watchhandler.h",
-                "watchutils.cpp", "watchutils.h",
-                "watchwindow.cpp", "watchwindow.h",
-                "simplifytype.cpp", "simplifytype.h",
-                "unstartedappwatcherdialog.cpp", "unstartedappwatcherdialog.h"
-            ]
-        }
-
-        Group {
-            name: "cdb"
-            prefix: "cdb/"
-            files: [
-                "cdbengine.cpp", "cdbengine.h",
-                "cdboptionspage.cpp", "cdboptionspage.h",
-                "cdbparsehelpers.cpp", "cdbparsehelpers.h",
-                "stringinputstream.cpp", "stringinputstream.h",
-            ]
-        }
-
-        Group {
-            name: "gdb"
-            prefix: "gdb/"
-            files: [
-                "gdbengine.cpp", "gdbengine.h",
-                "gdbsettings.cpp", "gdbsettings.h",
-            ]
-        }
-
-        Group {
-            name: "lldb"
-            prefix: "lldb/"
-            files: [
-                "lldbengine.cpp", "lldbengine.h"
-            ]
-        }
-
-        Group {
-            name: "pdb"
-            prefix: "pdb/"
-            files: ["pdbengine.cpp", "pdbengine.h"]
-        }
-
-        Group {
-            name: "dap"
-            prefix: "dap/"
-            files: [
-                "cmakedapengine.cpp", "cmakedapengine.h",
-                "dapclient.cpp", "dapclient.h",
-                "dapengine.cpp", "dapengine.h",
-                "gdbdapengine.cpp", "gdbdapengine.h",
-                "pydapengine.cpp", "pydapengine.h",
-            ]
-        }
-
-        Group {
-            name: "uvsc"
-            prefix: "uvsc/"
-            files: [
-                "uvscclient.cpp", "uvscclient.h",
-                "uvscdatatypes.h",
-                "uvscengine.cpp", "uvscengine.h",
-                "uvscfunctions.h",
-                "uvscutils.cpp", "uvscutils.h",
-            ]
-        }
-
-        Group {
-            name: "QML Debugger"
-            prefix: "qml/"
-            files: [
-                "interactiveinterpreter.cpp", "interactiveinterpreter.h",
-                "qmlengine.cpp", "qmlengine.h",
-                "qmlengineutils.cpp", "qmlengineutils.h",
-                "qmlinspectoragent.cpp", "qmlinspectoragent.h",
-                "qmlv8debuggerclientconstants.h"
-            ]
-        }
-
-        Group {
-            name: "Debugger Console"
-            prefix: "console/"
-            files: [
-                "consoleitem.cpp", "consoleitem.h",
-                "consoleedit.cpp", "consoleedit.h",
-                "consoleitemdelegate.cpp", "consoleitemdelegate.h",
-                "consoleitemmodel.cpp", "consoleitemmodel.h",
-                "console.cpp", "console.h",
-                "consoleproxymodel.cpp", "consoleproxymodel.h",
-                "consoleview.cpp", "consoleview.h"
-            ]
-        }
-
-        Group {
-            name: "shared"
-            prefix: "shared/"
-            files: [
-                "cdbsymbolpathlisteditor.cpp",
-                "cdbsymbolpathlisteditor.h",
-                "hostutils.cpp", "hostutils.h",
-                "peutils.cpp", "peutils.h",
-                "symbolpathsdialog.cpp", "symbolpathsdialog.h"
-            ]
-        }
-
-        Group {
-            name: "Images"
-            prefix: "images/"
-            files: ["*.png"]
-        }
-
-        Group {
-            name: "Images/qml"
-            prefix: "images/qml/"
-            files: ["*.png"]
-        }
-
-        Group {
-            name: "Images/analyzer"
-            prefix: "analyzer/images/"
-            files: ["*.png"]
-        }
-
-        Group {
-            name: "RegistryAccess"
-            condition: qbs.targetOS.contains("windows")
-            prefix: project.sharedSourcesDir + "/registryaccess/"
-            files: [
-                "registryaccess.cpp",
-                "registryaccess.h",
-            ]
-        }
-
-        Group {
-            name: "RegisterPostMortem"
-            condition: qbs.targetOS.contains("windows")
-            files: [
-                "registerpostmortemaction.cpp",
-                "registerpostmortemaction.h",
-            ]
-        }
-
-        Properties {
-            condition: qbs.targetOS.contains("windows")
-            cpp.dynamicLibraries: [
-                "advapi32",
-                "ole32",
-                "shell32"
-            ]
-        }
-
-        Group {
-            name: "Analyzer"
-            prefix: "analyzer/"
-            files: [
-                "analyzerbase.qrc",
-                "analyzerconstants.h",
-                "analyzericons.h",
-                "analyzermanager.h",
-                "analyzerrunconfigwidget.cpp",
-                "analyzerrunconfigwidget.h",
-                "analyzerutils.cpp",
-                "analyzerutils.h",
-                "detailederrorview.cpp",
-                "detailederrorview.h",
-                "diagnosticlocation.cpp",
-                "diagnosticlocation.h",
-                "startremotedialog.cpp",
-                "startremotedialog.h",
-            ]
-        }
-
-        QtcTestFiles {
-            files: [
-                "debuggerunittests.qrc",
-            ]
-        }
-
-        Group {
-            name: "Unit test resources"
-            prefix: "unit-tests/"
-            fileTags: []
-            files: ["**/*"]
-        }
-
-        Export {
-            Depends { name: "CPlusPlus" }
-        }
     }
 }
diff --git a/src/plugins/help/help.qbs b/src/plugins/help/help.qbs
index a5eefb620dd..df960310e5b 100644
--- a/src/plugins/help/help.qbs
+++ b/src/plugins/help/help.qbs
@@ -1,90 +1,86 @@
 import qbs.Utilities
 
-Project {
+QtcPlugin {
     name: "Help"
 
-    QtcPlugin {
-        name: "Help"
+    Depends { name: "Qt"; submodules: ["help", "network", "sql"] }
+    Depends { name: "Qt.printsupport" }
+    Depends { name: "Qt.webenginewidgets"; required: false }
 
-        Depends { name: "Qt"; submodules: ["help", "network", "sql"]; }
-        Depends { name: "Qt.printsupport" }
-        Depends { name: "Qt.webenginewidgets"; required: false }
+    Depends { name: "Aggregation" }
+    Depends { name: "Utils" }
 
-        Depends { name: "Aggregation" }
-        Depends { name: "Utils" }
+    Depends { name: "Core" }
+    Depends { name: "ProjectExplorer" }
 
-        Depends { name: "Core" }
-        Depends { name: "ProjectExplorer" }
+    Depends { name: "qlitehtml"; required: false }
 
-        Depends { name: "qlitehtml"; required: false }
+    cpp.defines: {
+        var defines = base.concat(["QT_CLUCENE_SUPPORT"]);
+        if (Qt.webenginewidgets.present)
+            defines.push("QTC_WEBENGINE_HELPVIEWER");
+        if (qlitehtml.present)
+            defines.push("QTC_LITEHTML_HELPVIEWER")
+        return defines;
+    }
 
-        cpp.defines: {
-            var defines = base.concat(["QT_CLUCENE_SUPPORT"]);
-            if (Qt.webenginewidgets.present)
-                defines.push("QTC_WEBENGINE_HELPVIEWER");
-            if (qlitehtml.present)
-                defines.push("QTC_LITEHTML_HELPVIEWER")
-            return defines;
-        }
+    // We include headers from src/shared/help, and their sources include headers from here...
+    cpp.includePaths: base.concat([sharedSources.prefix, path])
 
-        // We include headers from src/shared/help, and their sources include headers from here...
-        cpp.includePaths: base.concat([sharedSources.prefix, path])
+    Group {
+        name: "Sources"
+        files: [
+            "docsettingspage.cpp", "docsettingspage.h",
+            "filtersettingspage.cpp", "filtersettingspage.h",
+            "generalsettingspage.cpp", "generalsettingspage.h",
+            "help.qrc",
+            "helpconstants.h",
+            "helpfindsupport.cpp", "helpfindsupport.h",
+            "helpindexfilter.cpp", "helpindexfilter.h",
+            "helpmanager.cpp", "helpmanager.h",
+            "helpplugin.cpp", "helpplugin.h",
+            "helpviewer.cpp", "helpviewer.h",
+            "helpwidget.cpp", "helpwidget.h",
+            "helptr.h",
+            "localhelpmanager.cpp", "localhelpmanager.h",
+            "openpagesmanager.cpp", "openpagesmanager.h",
+            "openpagesswitcher.cpp", "openpagesswitcher.h",
+            "openpageswidget.cpp", "openpageswidget.h",
+            "searchtaskhandler.cpp", "searchtaskhandler.h",
+            "searchwidget.cpp", "searchwidget.h",
+            "textbrowserhelpviewer.cpp", "textbrowserhelpviewer.h",
+            "xbelsupport.cpp", "xbelsupport.h",
+        ]
+    }
 
-        Group {
-            name: "Sources"
-            files: [
-                "docsettingspage.cpp", "docsettingspage.h",
-                "filtersettingspage.cpp", "filtersettingspage.h",
-                "generalsettingspage.cpp", "generalsettingspage.h",
-                "help.qrc",
-                "helpconstants.h",
-                "helpfindsupport.cpp", "helpfindsupport.h",
-                "helpindexfilter.cpp", "helpindexfilter.h",
-                "helpmanager.cpp", "helpmanager.h",
-                "helpplugin.cpp", "helpplugin.h",
-                "helpviewer.cpp", "helpviewer.h",
-                "helpwidget.cpp", "helpwidget.h",
-                "helptr.h",
-                "localhelpmanager.cpp", "localhelpmanager.h",
-                "openpagesmanager.cpp", "openpagesmanager.h",
-                "openpagesswitcher.cpp", "openpagesswitcher.h",
-                "openpageswidget.cpp", "openpageswidget.h",
-                "searchtaskhandler.cpp", "searchtaskhandler.h",
-                "searchwidget.cpp", "searchwidget.h",
-                "textbrowserhelpviewer.cpp", "textbrowserhelpviewer.h",
-                "xbelsupport.cpp", "xbelsupport.h",
-            ]
-        }
+    Group {
+        name: "WebEngine Sources"
+        condition: Qt.webenginewidgets.present
+        files: [
+            "webenginehelpviewer.cpp", "webenginehelpviewer.h"
+        ]
+    }
 
-        Group {
-            name: "WebEngine Sources"
-            condition: Qt.webenginewidgets.present
-            files: [
-                "webenginehelpviewer.cpp", "webenginehelpviewer.h"
-            ]
-        }
+    Group {
+        name: "litehtml-specific sources"
+        condition: qlitehtml.present
+        cpp.warningLevel: "none"
+        files: [
+            "litehtmlhelpviewer.cpp",
+            "litehtmlhelpviewer.h",
+        ]
+    }
 
-        Group {
-            name: "litehtml-specific sources"
-            condition: qlitehtml.present
-            cpp.warningLevel: "none"
-            files: [
-                "litehtmlhelpviewer.cpp",
-                "litehtmlhelpviewer.h",
-            ]
-        }
-
-        Group {
-            id: sharedSources
-            name: "Shared Sources"
-            prefix: project.sharedSourcesDir + "/help/"
-            files: [
-                "bookmarkmanager.cpp", "bookmarkmanager.h",
-                "contentwindow.cpp", "contentwindow.h",
-                "helpicons.h",
-                "indexwindow.cpp", "indexwindow.h",
-                "topicchooser.cpp", "topicchooser.h",
-            ]
-        }
+    Group {
+        id: sharedSources
+        name: "Shared Sources"
+        prefix: project.sharedSourcesDir + "/help/"
+        files: [
+            "bookmarkmanager.cpp", "bookmarkmanager.h",
+            "contentwindow.cpp", "contentwindow.h",
+            "helpicons.h",
+            "indexwindow.cpp", "indexwindow.h",
+            "topicchooser.cpp", "topicchooser.h",
+        ]
     }
 }
diff --git a/src/plugins/projectexplorer/projectexplorer.qbs b/src/plugins/projectexplorer/projectexplorer.qbs
index 611083439d0..5f24d9f12da 100644
--- a/src/plugins/projectexplorer/projectexplorer.qbs
+++ b/src/plugins/projectexplorer/projectexplorer.qbs
@@ -1,261 +1,257 @@
-import qbs 1.0
-
-Project {
+QtcPlugin {
     name: "ProjectExplorer"
 
-    QtcPlugin {
-        Depends { name: "Qt"; submodules: ["widgets", "xml", "network", "qml"] }
-        Depends { name: "Aggregation" }
-        Depends { name: "Utils" }
+    Depends { name: "Qt"; submodules: ["widgets", "xml", "network", "qml"] }
+    Depends { name: "Aggregation" }
+    Depends { name: "Utils" }
 
-        Depends { name: "Core" }
-        Depends { name: "TextEditor" }
+    Depends { name: "Core" }
+    Depends { name: "TextEditor" }
 
-        Depends { name: "libclang"; required: false }
-        Depends { name: "clang_defines" }
+    Depends { name: "libclang"; required: false }
+    Depends { name: "clang_defines" }
 
-        pluginTestDepends: ["GenericProjectManager"]
+    pluginTestDepends: ["GenericProjectManager"]
 
-        Group {
-            name: "General"
-            files: [
-                "abi.cpp", "abi.h",
-                "abiwidget.cpp", "abiwidget.h",
-                "abstractprocessstep.cpp", "abstractprocessstep.h",
-                "addrunconfigdialog.cpp", "addrunconfigdialog.h",
-                "allprojectsfilter.cpp", "allprojectsfilter.h",
-                "allprojectsfind.cpp", "allprojectsfind.h",
-                "appoutputpane.cpp", "appoutputpane.h",
-                "baseprojectwizarddialog.cpp", "baseprojectwizarddialog.h",
-                "buildaspects.cpp", "buildaspects.h",
-                "buildconfiguration.cpp", "buildconfiguration.h",
-                "buildinfo.cpp", "buildinfo.h",
-                "buildmanager.cpp", "buildmanager.h",
-                "buildprogress.cpp", "buildprogress.h",
-                "buildpropertiessettings.cpp", "buildpropertiessettings.h",
-                "buildsettingspropertiespage.cpp", "buildsettingspropertiespage.h",
-                "buildstep.cpp", "buildstep.h",
-                "buildsteplist.cpp", "buildsteplist.h",
-                "buildstepspage.cpp", "buildstepspage.h",
-                "buildsystem.cpp", "buildsystem.h",
-                "buildtargetinfo.h",
-                "buildtargettype.h",
-                "clangparser.cpp", "clangparser.h",
-                "codestylesettingspropertiespage.cpp", "codestylesettingspropertiespage.h",
-                "compileoutputwindow.cpp", "compileoutputwindow.h",
-                "configtaskhandler.cpp", "configtaskhandler.h",
-                "copystep.cpp", "copystep.h",
-                "copytaskhandler.cpp", "copytaskhandler.h",
-                "currentprojectfilter.cpp", "currentprojectfilter.h",
-                "currentprojectfind.cpp", "currentprojectfind.h",
-                "customexecutablerunconfiguration.cpp", "customexecutablerunconfiguration.h",
-                "customparser.cpp", "customparser.h",
-                "customparserconfigdialog.cpp", "customparserconfigdialog.h",
-                "customparserssettingspage.cpp", "customparserssettingspage.h",
-                "customtoolchain.cpp", "customtoolchain.h",
-                "dependenciespanel.cpp", "dependenciespanel.h",
-                "deployablefile.cpp", "deployablefile.h",
-                "deployconfiguration.cpp", "deployconfiguration.h",
-                "deploymentdata.cpp",
-                "deploymentdata.h",
-                "deploymentdataview.cpp",
-                "deploymentdataview.h",
-                "desktoprunconfiguration.cpp", "desktoprunconfiguration.h",
-                "editorconfiguration.cpp", "editorconfiguration.h",
-                "editorsettingspropertiespage.cpp", "editorsettingspropertiespage.h",
-                "environmentaspect.cpp", "environmentaspect.h",
-                "environmentaspectwidget.cpp", "environmentaspectwidget.h",
-                "environmentwidget.cpp", "environmentwidget.h",
-                "expanddata.cpp", "expanddata.h",
-                "extraabi.cpp", "extraabi.h",
-                "extracompiler.cpp", "extracompiler.h",
-                "fileinsessionfinder.cpp", "fileinsessionfinder.h",
-                "filesinallprojectsfind.cpp", "filesinallprojectsfind.h",
-                "filterkitaspectsdialog.cpp", "filterkitaspectsdialog.h",
-                "gccparser.cpp", "gccparser.h",
-                "gcctoolchain.cpp", "gcctoolchain.h",
-                "gnumakeparser.cpp", "gnumakeparser.h",
-                "headerpath.h",
-                "importwidget.cpp", "importwidget.h",
-                "ioutputparser.cpp", "ioutputparser.h",
-                "ipotentialkit.h",
-                "itaskhandler.h",
-                "kit.cpp", "kit.h",
-                "kitaspects.cpp", "kitaspects.h",
-                "kitchooser.cpp", "kitchooser.h",
-                "kitfeatureprovider.h",
-                "kitmanager.cpp", "kitmanager.h",
-                "kitmanagerconfigwidget.cpp", "kitmanagerconfigwidget.h",
-                "kitoptionspage.cpp", "kitoptionspage.h",
-                "ldparser.cpp", "ldparser.h",
-                "lldparser.cpp", "lldparser.h",
-                "linuxiccparser.cpp", "linuxiccparser.h",
-                "makestep.cpp", "makestep.h",
-                "miniprojecttargetselector.cpp", "miniprojecttargetselector.h",
-                "msvcparser.cpp", "msvcparser.h",
-                "namedwidget.cpp", "namedwidget.h",
-                "osparser.cpp", "osparser.h",
-                "panelswidget.cpp", "panelswidget.h",
-                "parseissuesdialog.cpp", "parseissuesdialog.h",
-                "processparameters.cpp", "processparameters.h",
-                "processstep.cpp", "processstep.h",
-                "project.cpp", "project.h",
-                "projectcommentssettings.cpp", "projectcommentssettings.h",
-                "projectconfiguration.cpp", "projectconfiguration.h",
-                "projectconfigurationmodel.cpp", "projectconfigurationmodel.h",
-                "projectexplorer.cpp", "projectexplorer.h",
-                "projectexplorer.qrc",
-                "projectexplorer_export.h",
-                "projectexplorerconstants.cpp",
-                "projectexplorerconstants.h",
-                "projectexplorericons.h", "projectexplorericons.cpp",
-                "projectexplorersettings.h", "projectexplorersettings.cpp",
-                "projectexplorertr.h",
-                "projectfilewizardextension.cpp", "projectfilewizardextension.h",
-                "projectimporter.cpp", "projectimporter.h",
-                "projectmacro.cpp", "projectmacro.h",
-                "projectmanager.cpp", "projectmanager.h",
-                "projectmodels.cpp", "projectmodels.h",
-                "projectnodes.cpp", "projectnodes.h",
-                "projectpanelfactory.cpp", "projectpanelfactory.h",
-                "projectsettingswidget.cpp", "projectsettingswidget.h",
-                "projecttree.cpp",
-                "projecttree.h",
-                "projecttreewidget.cpp", "projecttreewidget.h",
-                "projectwindow.cpp", "projectwindow.h",
-                "projectwizardpage.cpp", "projectwizardpage.h",
-                "rawprojectpart.cpp", "rawprojectpart.h",
-                "removetaskhandler.cpp", "removetaskhandler.h",
-                "runconfiguration.cpp", "runconfiguration.h",
-                "runcontrol.cpp", "runcontrol.h",
-                "runconfigurationaspects.cpp", "runconfigurationaspects.h",
-                "runsettingspropertiespage.cpp", "runsettingspropertiespage.h",
-                "sanitizerparser.cpp", "sanitizerparser.h",
-                "selectablefilesmodel.cpp", "selectablefilesmodel.h",
-                "showineditortaskhandler.cpp", "showineditortaskhandler.h",
-                "showoutputtaskhandler.cpp", "showoutputtaskhandler.h",
-                "simpleprojectwizard.cpp", "simpleprojectwizard.h",
-                "target.cpp", "target.h",
-                "targetsettingspanel.cpp", "targetsettingspanel.h",
-                "targetsetuppage.cpp", "targetsetuppage.h",
-                "targetsetupwidget.cpp", "targetsetupwidget.h",
-                "task.cpp", "task.h",
-                "taskfile.cpp", "taskfile.h",
-                "taskhub.cpp", "taskhub.h",
-                "taskmodel.cpp", "taskmodel.h",
-                "taskwindow.cpp", "taskwindow.h",
-                "toolchain.cpp", "toolchain.h",
-                "toolchaincache.h",
-                "toolchainconfigwidget.cpp", "toolchainconfigwidget.h",
-                "toolchainmanager.cpp", "toolchainmanager.h",
-                "toolchainoptionspage.cpp", "toolchainoptionspage.h",
-                "toolchainsettingsaccessor.cpp", "toolchainsettingsaccessor.h",
-                "treescanner.cpp", "treescanner.h",
-                "userfileaccessor.cpp", "userfileaccessor.h",
-                "vcsannotatetaskhandler.cpp", "vcsannotatetaskhandler.h",
-                "waitforstopdialog.cpp", "waitforstopdialog.h",
-                "windebuginterface.cpp", "windebuginterface.h",
-                "xcodebuildparser.cpp", "xcodebuildparser.h"
-            ]
-        }
+    Group {
+        name: "General"
+        files: [
+            "abi.cpp", "abi.h",
+            "abiwidget.cpp", "abiwidget.h",
+            "abstractprocessstep.cpp", "abstractprocessstep.h",
+            "addrunconfigdialog.cpp", "addrunconfigdialog.h",
+            "allprojectsfilter.cpp", "allprojectsfilter.h",
+            "allprojectsfind.cpp", "allprojectsfind.h",
+            "appoutputpane.cpp", "appoutputpane.h",
+            "baseprojectwizarddialog.cpp", "baseprojectwizarddialog.h",
+            "buildaspects.cpp", "buildaspects.h",
+            "buildconfiguration.cpp", "buildconfiguration.h",
+            "buildinfo.cpp", "buildinfo.h",
+            "buildmanager.cpp", "buildmanager.h",
+            "buildprogress.cpp", "buildprogress.h",
+            "buildpropertiessettings.cpp", "buildpropertiessettings.h",
+            "buildsettingspropertiespage.cpp", "buildsettingspropertiespage.h",
+            "buildstep.cpp", "buildstep.h",
+            "buildsteplist.cpp", "buildsteplist.h",
+            "buildstepspage.cpp", "buildstepspage.h",
+            "buildsystem.cpp", "buildsystem.h",
+            "buildtargetinfo.h",
+            "buildtargettype.h",
+            "clangparser.cpp", "clangparser.h",
+            "codestylesettingspropertiespage.cpp", "codestylesettingspropertiespage.h",
+            "compileoutputwindow.cpp", "compileoutputwindow.h",
+            "configtaskhandler.cpp", "configtaskhandler.h",
+            "copystep.cpp", "copystep.h",
+            "copytaskhandler.cpp", "copytaskhandler.h",
+            "currentprojectfilter.cpp", "currentprojectfilter.h",
+            "currentprojectfind.cpp", "currentprojectfind.h",
+            "customexecutablerunconfiguration.cpp", "customexecutablerunconfiguration.h",
+            "customparser.cpp", "customparser.h",
+            "customparserconfigdialog.cpp", "customparserconfigdialog.h",
+            "customparserssettingspage.cpp", "customparserssettingspage.h",
+            "customtoolchain.cpp", "customtoolchain.h",
+            "dependenciespanel.cpp", "dependenciespanel.h",
+            "deployablefile.cpp", "deployablefile.h",
+            "deployconfiguration.cpp", "deployconfiguration.h",
+            "deploymentdata.cpp",
+            "deploymentdata.h",
+            "deploymentdataview.cpp",
+            "deploymentdataview.h",
+            "desktoprunconfiguration.cpp", "desktoprunconfiguration.h",
+            "editorconfiguration.cpp", "editorconfiguration.h",
+            "editorsettingspropertiespage.cpp", "editorsettingspropertiespage.h",
+            "environmentaspect.cpp", "environmentaspect.h",
+            "environmentaspectwidget.cpp", "environmentaspectwidget.h",
+            "environmentwidget.cpp", "environmentwidget.h",
+            "expanddata.cpp", "expanddata.h",
+            "extraabi.cpp", "extraabi.h",
+            "extracompiler.cpp", "extracompiler.h",
+            "fileinsessionfinder.cpp", "fileinsessionfinder.h",
+            "filesinallprojectsfind.cpp", "filesinallprojectsfind.h",
+            "filterkitaspectsdialog.cpp", "filterkitaspectsdialog.h",
+            "gccparser.cpp", "gccparser.h",
+            "gcctoolchain.cpp", "gcctoolchain.h",
+            "gnumakeparser.cpp", "gnumakeparser.h",
+            "headerpath.h",
+            "importwidget.cpp", "importwidget.h",
+            "ioutputparser.cpp", "ioutputparser.h",
+            "ipotentialkit.h",
+            "itaskhandler.h",
+            "kit.cpp", "kit.h",
+            "kitaspects.cpp", "kitaspects.h",
+            "kitchooser.cpp", "kitchooser.h",
+            "kitfeatureprovider.h",
+            "kitmanager.cpp", "kitmanager.h",
+            "kitmanagerconfigwidget.cpp", "kitmanagerconfigwidget.h",
+            "kitoptionspage.cpp", "kitoptionspage.h",
+            "ldparser.cpp", "ldparser.h",
+            "lldparser.cpp", "lldparser.h",
+            "linuxiccparser.cpp", "linuxiccparser.h",
+            "makestep.cpp", "makestep.h",
+            "miniprojecttargetselector.cpp", "miniprojecttargetselector.h",
+            "msvcparser.cpp", "msvcparser.h",
+            "namedwidget.cpp", "namedwidget.h",
+            "osparser.cpp", "osparser.h",
+            "panelswidget.cpp", "panelswidget.h",
+            "parseissuesdialog.cpp", "parseissuesdialog.h",
+            "processparameters.cpp", "processparameters.h",
+            "processstep.cpp", "processstep.h",
+            "project.cpp", "project.h",
+            "projectcommentssettings.cpp", "projectcommentssettings.h",
+            "projectconfiguration.cpp", "projectconfiguration.h",
+            "projectconfigurationmodel.cpp", "projectconfigurationmodel.h",
+            "projectexplorer.cpp", "projectexplorer.h",
+            "projectexplorer.qrc",
+            "projectexplorer_export.h",
+            "projectexplorerconstants.cpp",
+            "projectexplorerconstants.h",
+            "projectexplorericons.h", "projectexplorericons.cpp",
+            "projectexplorersettings.h", "projectexplorersettings.cpp",
+            "projectexplorertr.h",
+            "projectfilewizardextension.cpp", "projectfilewizardextension.h",
+            "projectimporter.cpp", "projectimporter.h",
+            "projectmacro.cpp", "projectmacro.h",
+            "projectmanager.cpp", "projectmanager.h",
+            "projectmodels.cpp", "projectmodels.h",
+            "projectnodes.cpp", "projectnodes.h",
+            "projectpanelfactory.cpp", "projectpanelfactory.h",
+            "projectsettingswidget.cpp", "projectsettingswidget.h",
+            "projecttree.cpp",
+            "projecttree.h",
+            "projecttreewidget.cpp", "projecttreewidget.h",
+            "projectwindow.cpp", "projectwindow.h",
+            "projectwizardpage.cpp", "projectwizardpage.h",
+            "rawprojectpart.cpp", "rawprojectpart.h",
+            "removetaskhandler.cpp", "removetaskhandler.h",
+            "runconfiguration.cpp", "runconfiguration.h",
+            "runcontrol.cpp", "runcontrol.h",
+            "runconfigurationaspects.cpp", "runconfigurationaspects.h",
+            "runsettingspropertiespage.cpp", "runsettingspropertiespage.h",
+            "sanitizerparser.cpp", "sanitizerparser.h",
+            "selectablefilesmodel.cpp", "selectablefilesmodel.h",
+            "showineditortaskhandler.cpp", "showineditortaskhandler.h",
+            "showoutputtaskhandler.cpp", "showoutputtaskhandler.h",
+            "simpleprojectwizard.cpp", "simpleprojectwizard.h",
+            "target.cpp", "target.h",
+            "targetsettingspanel.cpp", "targetsettingspanel.h",
+            "targetsetuppage.cpp", "targetsetuppage.h",
+            "targetsetupwidget.cpp", "targetsetupwidget.h",
+            "task.cpp", "task.h",
+            "taskfile.cpp", "taskfile.h",
+            "taskhub.cpp", "taskhub.h",
+            "taskmodel.cpp", "taskmodel.h",
+            "taskwindow.cpp", "taskwindow.h",
+            "toolchain.cpp", "toolchain.h",
+            "toolchaincache.h",
+            "toolchainconfigwidget.cpp", "toolchainconfigwidget.h",
+            "toolchainmanager.cpp", "toolchainmanager.h",
+            "toolchainoptionspage.cpp", "toolchainoptionspage.h",
+            "toolchainsettingsaccessor.cpp", "toolchainsettingsaccessor.h",
+            "treescanner.cpp", "treescanner.h",
+            "userfileaccessor.cpp", "userfileaccessor.h",
+            "vcsannotatetaskhandler.cpp", "vcsannotatetaskhandler.h",
+            "waitforstopdialog.cpp", "waitforstopdialog.h",
+            "windebuginterface.cpp", "windebuginterface.h",
+            "xcodebuildparser.cpp", "xcodebuildparser.h"
+        ]
+    }
 
-        Group {
-            name: "Project Welcome Page"
-            files: [
-                "projectwelcomepage.cpp",
-                "projectwelcomepage.h"
-            ]
-        }
+    Group {
+        name: "Project Welcome Page"
+        files: [
+            "projectwelcomepage.cpp",
+            "projectwelcomepage.h"
+        ]
+    }
 
-        Group {
-            name: "JsonWizard"
-            prefix: "jsonwizard/"
-            files: [
-                "jsonfieldpage.cpp", "jsonfieldpage_p.h", "jsonfieldpage.h",
-                "jsonfilepage.cpp", "jsonfilepage.h",
-                "jsonkitspage.cpp", "jsonkitspage.h",
-                "jsonprojectpage.cpp", "jsonprojectpage.h",
-                "jsonsummarypage.cpp", "jsonsummarypage.h",
-                "jsonwizard.cpp", "jsonwizard.h",
-                "jsonwizardfactory.cpp", "jsonwizardfactory.h",
-                "jsonwizardfilegenerator.cpp", "jsonwizardfilegenerator.h",
-                "jsonwizardgeneratorfactory.cpp", "jsonwizardgeneratorfactory.h",
-                "jsonwizardpagefactory.cpp", "jsonwizardpagefactory.h",
-                "jsonwizardpagefactory_p.cpp", "jsonwizardpagefactory_p.h",
-                "jsonwizardscannergenerator.cpp", "jsonwizardscannergenerator.h",
-                "wizarddebug.h"
-            ]
-        }
+    Group {
+        name: "JsonWizard"
+        prefix: "jsonwizard/"
+        files: [
+            "jsonfieldpage.cpp", "jsonfieldpage_p.h", "jsonfieldpage.h",
+            "jsonfilepage.cpp", "jsonfilepage.h",
+            "jsonkitspage.cpp", "jsonkitspage.h",
+            "jsonprojectpage.cpp", "jsonprojectpage.h",
+            "jsonsummarypage.cpp", "jsonsummarypage.h",
+            "jsonwizard.cpp", "jsonwizard.h",
+            "jsonwizardfactory.cpp", "jsonwizardfactory.h",
+            "jsonwizardfilegenerator.cpp", "jsonwizardfilegenerator.h",
+            "jsonwizardgeneratorfactory.cpp", "jsonwizardgeneratorfactory.h",
+            "jsonwizardpagefactory.cpp", "jsonwizardpagefactory.h",
+            "jsonwizardpagefactory_p.cpp", "jsonwizardpagefactory_p.h",
+            "jsonwizardscannergenerator.cpp", "jsonwizardscannergenerator.h",
+            "wizarddebug.h"
+        ]
+    }
 
-        Group {
-            name: "CustomWizard"
-            prefix: "customwizard/"
-            files: [
-                "customwizard.cpp", "customwizard.h",
-                "customwizardpage.cpp", "customwizardpage.h",
-                "customwizardparameters.cpp", "customwizardparameters.h",
-                "customwizardscriptgenerator.cpp", "customwizardscriptgenerator.h"
-            ]
-        }
+    Group {
+        name: "CustomWizard"
+        prefix: "customwizard/"
+        files: [
+            "customwizard.cpp", "customwizard.h",
+            "customwizardpage.cpp", "customwizardpage.h",
+            "customwizardparameters.cpp", "customwizardparameters.h",
+            "customwizardscriptgenerator.cpp", "customwizardscriptgenerator.h"
+        ]
+    }
 
-        Group {
-            name: "Device Support"
-            prefix: "devicesupport/"
-            files: [
-                "desktopdevice.cpp", "desktopdevice.h",
-                "desktopdevicefactory.cpp", "desktopdevicefactory.h",
-                "devicecheckbuildstep.cpp", "devicecheckbuildstep.h",
-                "devicefactoryselectiondialog.cpp", "devicefactoryselectiondialog.h",
-                "devicemanager.cpp", "devicemanager.h",
-                "devicemanagermodel.cpp", "devicemanagermodel.h",
-                "deviceprocessesdialog.cpp", "deviceprocessesdialog.h",
-                "devicesettingspage.cpp", "devicesettingspage.h",
-                "devicetestdialog.cpp", "devicetestdialog.h",
-                "deviceusedportsgatherer.cpp", "deviceusedportsgatherer.h",
-                "filetransfer.cpp", "filetransfer.h",
-                "filetransferinterface.h",
-                "idevice.cpp", "idevice.h",
-                "idevicefactory.cpp", "idevicefactory.h",
-                "idevicefwd.h",
-                "idevicewidget.h",
-                "processlist.cpp", "processlist.h",
-                "sshparameters.cpp", "sshparameters.h",
-                "sshsettings.cpp", "sshsettings.h",
-                "sshsettingspage.cpp", "sshsettingspage.h",
-                "desktopprocesssignaloperation.cpp", "desktopprocesssignaloperation.h"
-            ]
-        }
+    Group {
+        name: "Device Support"
+        prefix: "devicesupport/"
+        files: [
+            "desktopdevice.cpp", "desktopdevice.h",
+            "desktopdevicefactory.cpp", "desktopdevicefactory.h",
+            "devicecheckbuildstep.cpp", "devicecheckbuildstep.h",
+            "devicefactoryselectiondialog.cpp", "devicefactoryselectiondialog.h",
+            "devicemanager.cpp", "devicemanager.h",
+            "devicemanagermodel.cpp", "devicemanagermodel.h",
+            "deviceprocessesdialog.cpp", "deviceprocessesdialog.h",
+            "devicesettingspage.cpp", "devicesettingspage.h",
+            "devicetestdialog.cpp", "devicetestdialog.h",
+            "deviceusedportsgatherer.cpp", "deviceusedportsgatherer.h",
+            "filetransfer.cpp", "filetransfer.h",
+            "filetransferinterface.h",
+            "idevice.cpp", "idevice.h",
+            "idevicefactory.cpp", "idevicefactory.h",
+            "idevicefwd.h",
+            "idevicewidget.h",
+            "processlist.cpp", "processlist.h",
+            "sshparameters.cpp", "sshparameters.h",
+            "sshsettings.cpp", "sshsettings.h",
+            "sshsettingspage.cpp", "sshsettingspage.h",
+            "desktopprocesssignaloperation.cpp", "desktopprocesssignaloperation.h"
+        ]
+    }
 
-        Group {
-            name: "Images"
-            prefix: "images/"
-            files: ["*.png"]
-        }
+    Group {
+        name: "Images"
+        prefix: "images/"
+        files: ["*.png"]
+    }
 
-        Group {
-            name: "WindowsToolChains"
-            condition: qbs.targetOS.contains("windows") || qtc.testsEnabled
-            files: [
-                "msvctoolchain.cpp",
-                "msvctoolchain.h",
-            ]
-        }
+    Group {
+        name: "WindowsToolChains"
+        condition: qbs.targetOS.contains("windows") || qtc.testsEnabled
+        files: [
+            "msvctoolchain.cpp",
+            "msvctoolchain.h",
+        ]
+    }
 
-        QtcTestFiles {
-            files: ["outputparser_test.h", "outputparser_test.cpp"]
-        }
+    QtcTestFiles {
+        files: ["outputparser_test.h", "outputparser_test.cpp"]
+    }
 
-        Group {
-            name: "Test resources"
-            condition: qtc.testsEnabled
-            files: ["testdata/**"]
-            fileTags: ["qt.core.resource_data"]
-            Qt.core.resourcePrefix: "/projectexplorer"
-            Qt.core.resourceSourceBase: path
-        }
+    Group {
+        name: "Test resources"
+        condition: qtc.testsEnabled
+        files: ["testdata/**"]
+        fileTags: ["qt.core.resource_data"]
+        Qt.core.resourcePrefix: "/projectexplorer"
+        Qt.core.resourceSourceBase: path
+    }
 
-        Export {
-            Depends { name: "Qt.network" }
-        }
+    Export {
+        Depends { name: "Qt.network" }
     }
 }
diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs b/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs
index a7fe09d05b0..9252ad10503 100644
--- a/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs
+++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs
@@ -1,85 +1,81 @@
-import qbs 1.0
-
-Project {
+QtcPlugin {
     name: "QmakeProjectManager"
 
-    QtcPlugin {
-        Depends { name: "Qt"; submodules: ["widgets", "network"] }
-        Depends { name: "QmlJS" }
-        Depends { name: "Utils" }
+    Depends { name: "Qt"; submodules: ["widgets", "network"] }
+    Depends { name: "QmlJS" }
+    Depends { name: "Utils" }
 
-        Depends { name: "Core" }
-        Depends { name: "ProjectExplorer" }
+    Depends { name: "Core" }
+    Depends { name: "ProjectExplorer" }
+    Depends { name: "QtSupport" }
+    Depends { name: "CppEditor" }
+    Depends { name: "TextEditor" }
+    Depends { name: "ResourceEditor" }
+
+    Group {
+        name: "General"
+        files: [
+            "addlibrarywizard.cpp", "addlibrarywizard.h",
+            "librarydetailscontroller.cpp", "librarydetailscontroller.h",
+            "makefileparse.cpp", "makefileparse.h",
+            "profilecompletionassist.cpp", "profilecompletionassist.h",
+            "profileeditor.cpp", "profileeditor.h",
+            "profilehighlighter.cpp", "profilehighlighter.h",
+            "profilehoverhandler.cpp", "profilehoverhandler.h",
+            "qmakebuildinfo.h",
+            "qmakekitaspect.cpp", "qmakekitaspect.h",
+            "qmakemakestep.cpp", "qmakemakestep.h",
+            "qmakeparser.cpp", "qmakeparser.h",
+            "qmakeparsernodes.cpp", "qmakeparsernodes.h",
+            "qmakeprojectimporter.cpp", "qmakeprojectimporter.h",
+            "qmakesettings.cpp", "qmakesettings.h",
+            "qmakestep.cpp", "qmakestep.h",
+            "qmakebuildconfiguration.cpp", "qmakebuildconfiguration.h",
+            "qmakenodes.cpp", "qmakenodes.h",
+            "qmakenodetreebuilder.cpp", "qmakenodetreebuilder.h",
+            "qmakeproject.cpp", "qmakeproject.h",
+            "qmakeprojectmanager.qrc",
+            "qmakeprojectmanager_global.h", "qmakeprojectmanagertr.h",
+            "qmakeprojectmanagerconstants.h",
+            "qmakeprojectmanagerplugin.cpp", "qmakeprojectmanagerplugin.h",
+        ]
+    }
+
+    Group {
+        name: "Custom Widget Wizard"
+        prefix: "customwidgetwizard/"
+        files: [
+            "classdefinition.cpp", "classdefinition.h",
+            "classlist.cpp", "classlist.h",
+            "customwidgetpluginwizardpage.cpp", "customwidgetpluginwizardpage.h",
+            "customwidgetwidgetswizardpage.cpp", "customwidgetwidgetswizardpage.h",
+            "customwidgetwizard.cpp", "customwidgetwizard.h",
+            "customwidgetwizarddialog.cpp", "customwidgetwizarddialog.h",
+            "filenamingparameters.h",
+            "plugingenerator.cpp", "plugingenerator.h",
+            "pluginoptions.h"
+        ]
+    }
+
+    Group {
+        name: "Wizards"
+        prefix: "wizards/"
+        files: [
+            "qtprojectparameters.cpp", "qtprojectparameters.h",
+            "qtwizard.cpp", "qtwizard.h",
+            "subdirsprojectwizard.cpp", "subdirsprojectwizard.h",
+            "subdirsprojectwizarddialog.cpp", "subdirsprojectwizarddialog.h",
+            "wizards.qrc"
+        ]
+    }
+
+    Group {
+        name: "Wizard Images"
+        prefix: "wizards/images/"
+        files: ["*.png"]
+    }
+
+    Export {
         Depends { name: "QtSupport" }
-        Depends { name: "CppEditor" }
-        Depends { name: "TextEditor" }
-        Depends { name: "ResourceEditor" }
-
-        Group {
-            name: "General"
-            files: [
-                "addlibrarywizard.cpp", "addlibrarywizard.h",
-                "librarydetailscontroller.cpp", "librarydetailscontroller.h",
-                "makefileparse.cpp", "makefileparse.h",
-                "profilecompletionassist.cpp", "profilecompletionassist.h",
-                "profileeditor.cpp", "profileeditor.h",
-                "profilehighlighter.cpp", "profilehighlighter.h",
-                "profilehoverhandler.cpp", "profilehoverhandler.h",
-                "qmakebuildinfo.h",
-                "qmakekitaspect.cpp", "qmakekitaspect.h",
-                "qmakemakestep.cpp", "qmakemakestep.h",
-                "qmakeparser.cpp", "qmakeparser.h",
-                "qmakeparsernodes.cpp", "qmakeparsernodes.h",
-                "qmakeprojectimporter.cpp", "qmakeprojectimporter.h",
-                "qmakesettings.cpp", "qmakesettings.h",
-                "qmakestep.cpp", "qmakestep.h",
-                "qmakebuildconfiguration.cpp", "qmakebuildconfiguration.h",
-                "qmakenodes.cpp", "qmakenodes.h",
-                "qmakenodetreebuilder.cpp", "qmakenodetreebuilder.h",
-                "qmakeproject.cpp", "qmakeproject.h",
-                "qmakeprojectmanager.qrc",
-                "qmakeprojectmanager_global.h", "qmakeprojectmanagertr.h",
-                "qmakeprojectmanagerconstants.h",
-                "qmakeprojectmanagerplugin.cpp", "qmakeprojectmanagerplugin.h",
-            ]
-        }
-
-        Group {
-            name: "Custom Widget Wizard"
-            prefix: "customwidgetwizard/"
-            files: [
-                "classdefinition.cpp", "classdefinition.h",
-                "classlist.cpp", "classlist.h",
-                "customwidgetpluginwizardpage.cpp", "customwidgetpluginwizardpage.h",
-                "customwidgetwidgetswizardpage.cpp", "customwidgetwidgetswizardpage.h",
-                "customwidgetwizard.cpp", "customwidgetwizard.h",
-                "customwidgetwizarddialog.cpp", "customwidgetwizarddialog.h",
-                "filenamingparameters.h",
-                "plugingenerator.cpp", "plugingenerator.h",
-                "pluginoptions.h"
-            ]
-        }
-
-        Group {
-            name: "Wizards"
-            prefix: "wizards/"
-            files: [
-                "qtprojectparameters.cpp", "qtprojectparameters.h",
-                "qtwizard.cpp", "qtwizard.h",
-                "subdirsprojectwizard.cpp", "subdirsprojectwizard.h",
-                "subdirsprojectwizarddialog.cpp", "subdirsprojectwizarddialog.h",
-                "wizards.qrc"
-            ]
-        }
-
-        Group {
-            name: "Wizard Images"
-            prefix: "wizards/images/"
-            files: ["*.png"]
-        }
-
-        Export {
-            Depends { name: "QtSupport" }
-        }
     }
 }
diff --git a/src/plugins/qtsupport/qtsupport.qbs b/src/plugins/qtsupport/qtsupport.qbs
index cbfc055644e..7befd3ab95a 100644
--- a/src/plugins/qtsupport/qtsupport.qbs
+++ b/src/plugins/qtsupport/qtsupport.qbs
@@ -1,122 +1,118 @@
-import qbs 1.0
-
-Project {
+QtcPlugin {
     name: "QtSupport"
 
-    QtcPlugin {
-        Depends { name: "Qt"; submodules: ["widgets", "xml"]; }
-        Depends { name: "Utils" }
+    Depends { name: "Qt"; submodules: ["widgets", "xml"]; }
+    Depends { name: "Utils" }
 
-        Depends { name: "Core" }
+    Depends { name: "Core" }
+    Depends { name: "ProParser" }
+    Depends { name: "ProjectExplorer" }
+    Depends { name: "ResourceEditor" }
+
+    cpp.defines: base.concat([
+                                 "QMAKE_LIBRARY",
+                                 "QMAKE_BUILTIN_PRFS",
+                             ])
+    Properties {
+        condition: qbs.targetOS.contains("windows")
+        cpp.dynamicLibraries: "advapi32"
+    }
+
+    Export {
         Depends { name: "ProParser" }
-        Depends { name: "ProjectExplorer" }
-        Depends { name: "ResourceEditor" }
-
-        cpp.defines: base.concat([
-            "QMAKE_LIBRARY",
-            "QMAKE_BUILTIN_PRFS",
-        ])
-        Properties {
-            condition: qbs.targetOS.contains("windows")
-            cpp.dynamicLibraries: "advapi32"
-        }
-
-        Export {
-            Depends { name: "ProParser" }
-        }
-
-        Group {
-            name: "Pro Parser"
-            prefix: project.sharedSourcesDir + "/proparser/"
-            files: [
-                "ioutils.cpp",
-                "ioutils.h",
-                "profileevaluator.cpp",
-                "profileevaluator.h",
-                "proitems.cpp",
-                "proitems.h",
-                "proparser.qrc",
-                "prowriter.cpp",
-                "prowriter.h",
-                "qmake_global.h",
-                "qmakebuiltins.cpp",
-                "qmakeevaluator.cpp",
-                "qmakeevaluator.h",
-                "qmakeevaluator_p.h",
-                "qmakeglobals.cpp",
-                "qmakeglobals.h",
-                "qmakeparser.cpp",
-                "qmakeparser.h",
-                "qmakevfs.cpp",
-                "qmakevfs.h",
-                "registry.cpp",
-                "registry_p.h",
-            ]
-        }
+    }
 
+    Group {
+        name: "Pro Parser"
+        prefix: project.sharedSourcesDir + "/proparser/"
         files: [
-            "baseqtversion.cpp",
-            "baseqtversion.h",
-            "codegenerator.cpp",
-            "codegenerator.h",
-            "codegensettings.cpp",
-            "codegensettings.h",
-            "externaleditors.cpp",
-            "externaleditors.h",
-            "qtbuildaspects.cpp",
-            "qtbuildaspects.h",
-            "qtconfigwidget.cpp",
-            "qtconfigwidget.h",
-            "qtcppkitinfo.cpp",
-            "qtcppkitinfo.h",
-            "qtprojectimporter.cpp",
-            "qtprojectimporter.h",
-            "qtsupport.qrc",
-            "exampleslistmodel.cpp",
-            "exampleslistmodel.h",
-            "examplesparser.cpp",
-            "examplesparser.h",
-            "profilereader.cpp",
-            "profilereader.h",
-            "qscxmlcgenerator.cpp",
-            "qscxmlcgenerator.h",
-            "qtkitaspect.cpp",
-            "qtkitaspect.h",
-            "qtoptionspage.cpp",
-            "qtoptionspage.h",
-            "qtoutputformatter.cpp",
-            "qtoutputformatter.h",
-            "qtparser.cpp",
-            "qtparser.h",
-            "qtsupport_global.h", "qtsupporttr.h",
-            "qtsupportconstants.h",
-            "qtsupportplugin.cpp",
-            "qtsupportplugin.h",
-            "qttestparser.cpp",
-            "qttestparser.h",
-            "qtversionfactory.h",
-            "qtversionmanager.cpp",
-            "qtversionmanager.h",
-            "translationwizardpage.cpp",
-            "translationwizardpage.h",
-            "uicgenerator.cpp",
-            "uicgenerator.h",
+            "ioutils.cpp",
+            "ioutils.h",
+            "profileevaluator.cpp",
+            "profileevaluator.h",
+            "proitems.cpp",
+            "proitems.h",
+            "proparser.qrc",
+            "prowriter.cpp",
+            "prowriter.h",
+            "qmake_global.h",
+            "qmakebuiltins.cpp",
+            "qmakeevaluator.cpp",
+            "qmakeevaluator.h",
+            "qmakeevaluator_p.h",
+            "qmakeglobals.cpp",
+            "qmakeglobals.h",
+            "qmakeparser.cpp",
+            "qmakeparser.h",
+            "qmakevfs.cpp",
+            "qmakevfs.h",
+            "registry.cpp",
+            "registry_p.h",
         ]
+    }
 
-        Group {
-            name: "QtVersion"
-            files: [
-                "qtversions.cpp",
-                "qtversions.h",
-            ]
-        }
+    files: [
+        "baseqtversion.cpp",
+        "baseqtversion.h",
+        "codegenerator.cpp",
+        "codegenerator.h",
+        "codegensettings.cpp",
+        "codegensettings.h",
+        "externaleditors.cpp",
+        "externaleditors.h",
+        "qtbuildaspects.cpp",
+        "qtbuildaspects.h",
+        "qtconfigwidget.cpp",
+        "qtconfigwidget.h",
+        "qtcppkitinfo.cpp",
+        "qtcppkitinfo.h",
+        "qtprojectimporter.cpp",
+        "qtprojectimporter.h",
+        "qtsupport.qrc",
+        "exampleslistmodel.cpp",
+        "exampleslistmodel.h",
+        "examplesparser.cpp",
+        "examplesparser.h",
+        "profilereader.cpp",
+        "profilereader.h",
+        "qscxmlcgenerator.cpp",
+        "qscxmlcgenerator.h",
+        "qtkitaspect.cpp",
+        "qtkitaspect.h",
+        "qtoptionspage.cpp",
+        "qtoptionspage.h",
+        "qtoutputformatter.cpp",
+        "qtoutputformatter.h",
+        "qtparser.cpp",
+        "qtparser.h",
+        "qtsupport_global.h", "qtsupporttr.h",
+        "qtsupportconstants.h",
+        "qtsupportplugin.cpp",
+        "qtsupportplugin.h",
+        "qttestparser.cpp",
+        "qttestparser.h",
+        "qtversionfactory.h",
+        "qtversionmanager.cpp",
+        "qtversionmanager.h",
+        "translationwizardpage.cpp",
+        "translationwizardpage.h",
+        "uicgenerator.cpp",
+        "uicgenerator.h",
+    ]
 
-        Group {
-            name: "Getting Started Welcome Page"
-            files: [
-                "gettingstartedwelcomepage.cpp",
-                "gettingstartedwelcomepage.h"
-            ]
-        }
+    Group {
+        name: "QtVersion"
+        files: [
+            "qtversions.cpp",
+            "qtversions.h",
+        ]
+    }
+
+    Group {
+        name: "Getting Started Welcome Page"
+        files: [
+            "gettingstartedwelcomepage.cpp",
+            "gettingstartedwelcomepage.h"
+        ]
     }
 }
diff --git a/src/plugins/remotelinux/remotelinux.qbs b/src/plugins/remotelinux/remotelinux.qbs
index 519020b3f79..5a834fdef92 100644
--- a/src/plugins/remotelinux/remotelinux.qbs
+++ b/src/plugins/remotelinux/remotelinux.qbs
@@ -1,78 +1,74 @@
-import qbs 1.0
-
-Project {
+QtcPlugin {
     name: "RemoteLinux"
 
-    QtcPlugin {
-        Depends { name: "Qt.widgets" }
-        Depends { name: "QmlDebug" }
-        Depends { name: "Utils" }
+    Depends { name: "Qt.widgets" }
+    Depends { name: "QmlDebug" }
+    Depends { name: "Utils" }
 
-        Depends { name: "Core" }
-        Depends { name: "Debugger" }
-        Depends { name: "ProjectExplorer" }
+    Depends { name: "Core" }
+    Depends { name: "Debugger" }
+    Depends { name: "ProjectExplorer" }
 
+    files: [
+        "abstractremotelinuxdeploystep.cpp",
+        "abstractremotelinuxdeploystep.h",
+        "deploymenttimeinfo.cpp",
+        "deploymenttimeinfo.h",
+        "customcommanddeploystep.cpp",
+        "customcommanddeploystep.h",
+        "genericdirectuploadstep.cpp",
+        "genericdirectuploadstep.h",
+        "genericlinuxdeviceconfigurationwidget.cpp",
+        "genericlinuxdeviceconfigurationwidget.h",
+        "killappstep.cpp",
+        "killappstep.h",
+        "linuxdevice.cpp",
+        "linuxdevice.h",
+        "linuxdevicetester.cpp",
+        "linuxdevicetester.h",
+        "linuxprocessinterface.h",
+        "makeinstallstep.cpp",
+        "makeinstallstep.h",
+        "publickeydeploymentdialog.cpp",
+        "publickeydeploymentdialog.h",
+        "remotelinux.qrc",
+        "remotelinux_constants.h",
+        "remotelinux_export.h",
+        "remotelinuxcustomrunconfiguration.cpp",
+        "remotelinuxcustomrunconfiguration.h",
+        "remotelinuxdebugsupport.cpp",
+        "remotelinuxdebugsupport.h",
+        "remotelinuxenvironmentaspect.cpp",
+        "remotelinuxenvironmentaspect.h",
+        "remotelinuxplugin.cpp",
+        "remotelinuxplugin.h",
+        "remotelinuxrunconfiguration.cpp",
+        "remotelinuxrunconfiguration.h",
+        "remotelinuxsignaloperation.cpp",
+        "remotelinuxsignaloperation.h",
+        "remotelinuxtr.h",
+        "rsyncdeploystep.cpp",
+        "rsyncdeploystep.h",
+        "sshdevicewizard.cpp",
+        "sshdevicewizard.h",
+        "sshkeycreationdialog.cpp",
+        "sshkeycreationdialog.h",
+        "tarpackagecreationstep.cpp",
+        "tarpackagecreationstep.h",
+        "tarpackagedeploystep.cpp",
+        "tarpackagedeploystep.h",
+        "images/embeddedtarget.png",
+    ]
+
+    QtcTestFiles {
         files: [
-            "abstractremotelinuxdeploystep.cpp",
-            "abstractremotelinuxdeploystep.h",
-            "deploymenttimeinfo.cpp",
-            "deploymenttimeinfo.h",
-            "customcommanddeploystep.cpp",
-            "customcommanddeploystep.h",
-            "genericdirectuploadstep.cpp",
-            "genericdirectuploadstep.h",
-            "genericlinuxdeviceconfigurationwidget.cpp",
-            "genericlinuxdeviceconfigurationwidget.h",
-            "killappstep.cpp",
-            "killappstep.h",
-            "linuxdevice.cpp",
-            "linuxdevice.h",
-            "linuxdevicetester.cpp",
-            "linuxdevicetester.h",
-            "linuxprocessinterface.h",
-            "makeinstallstep.cpp",
-            "makeinstallstep.h",
-            "publickeydeploymentdialog.cpp",
-            "publickeydeploymentdialog.h",
-            "remotelinux.qrc",
-            "remotelinux_constants.h",
-            "remotelinux_export.h",
-            "remotelinuxcustomrunconfiguration.cpp",
-            "remotelinuxcustomrunconfiguration.h",
-            "remotelinuxdebugsupport.cpp",
-            "remotelinuxdebugsupport.h",
-            "remotelinuxenvironmentaspect.cpp",
-            "remotelinuxenvironmentaspect.h",
-            "remotelinuxplugin.cpp",
-            "remotelinuxplugin.h",
-            "remotelinuxrunconfiguration.cpp",
-            "remotelinuxrunconfiguration.h",
-            "remotelinuxsignaloperation.cpp",
-            "remotelinuxsignaloperation.h",
-            "remotelinuxtr.h",
-            "rsyncdeploystep.cpp",
-            "rsyncdeploystep.h",
-            "sshdevicewizard.cpp",
-            "sshdevicewizard.h",
-            "sshkeycreationdialog.cpp",
-            "sshkeycreationdialog.h",
-            "tarpackagecreationstep.cpp",
-            "tarpackagecreationstep.h",
-            "tarpackagedeploystep.cpp",
-            "tarpackagedeploystep.h",
-            "images/embeddedtarget.png",
+            "filesystemaccess_test.cpp",
+            "filesystemaccess_test.h",
         ]
+    }
 
-        QtcTestFiles {
-            files: [
-                "filesystemaccess_test.cpp",
-                "filesystemaccess_test.h",
-            ]
-        }
-
-        Export {
-            Depends { name: "Debugger" }
-            Depends { name: "Core" }
-        }
+    Export {
+        Depends { name: "Debugger" }
+        Depends { name: "Core" }
     }
 }
diff --git a/src/plugins/resourceeditor/resourceeditor.qbs b/src/plugins/resourceeditor/resourceeditor.qbs
index eb09034c0ca..eaa1c8a456b 100644
--- a/src/plugins/resourceeditor/resourceeditor.qbs
+++ b/src/plugins/resourceeditor/resourceeditor.qbs
@@ -1,39 +1,36 @@
-import qbs 1.0
-
-Project {
+QtcPlugin {
     name: "ResourceEditor"
 
-    QtcPlugin {
-        Depends { name: "Qt"; submodules: ["widgets", "xml"] }
-        Depends { name: "Aggregation" }
-        Depends { name: "ProjectExplorer" }
-        Depends { name: "Utils" }
+    Depends { name: "Qt"; submodules: ["widgets", "xml"] }
 
-        Depends { name: "Core" }
+    Depends { name: "Aggregation" }
+    Depends { name: "Utils" }
 
-        cpp.defines: base.concat(["RESOURCEEDITOR_LIBRARY"])
+    Depends { name: "Core" }
+    Depends { name: "ProjectExplorer" }
 
-        Group {
-            name: "General"
-            files: [
-                "resourceeditorconstants.h",
-                "resourceeditorfactory.cpp", "resourceeditorfactory.h",
-                "resourceeditorplugin.cpp", "resourceeditorplugin.h",
-                "resourceeditortr.h",
-                "resourceeditorw.cpp", "resourceeditorw.h",
-                "resource_global.h", "resourcenode.cpp", "resourcenode.h"
-            ]
-        }
+    cpp.defines: base.concat(["RESOURCEEDITOR_LIBRARY"])
 
-        Group {
-            name: "QRC Editor"
-            prefix: "qrceditor/"
-            files: [
-                "qrceditor.cpp", "qrceditor.h",
-                "resourcefile.cpp", "resourcefile_p.h",
-                "resourceview.cpp", "resourceview.h",
-                "undocommands.cpp", "undocommands_p.h",
-            ]
-        }
+    Group {
+        name: "General"
+        files: [
+            "resourceeditorconstants.h",
+            "resourceeditorfactory.cpp", "resourceeditorfactory.h",
+            "resourceeditorplugin.cpp", "resourceeditorplugin.h",
+            "resourceeditortr.h",
+            "resourceeditorw.cpp", "resourceeditorw.h",
+            "resource_global.h", "resourcenode.cpp", "resourcenode.h"
+        ]
+    }
+
+    Group {
+        name: "QRC Editor"
+        prefix: "qrceditor/"
+        files: [
+            "qrceditor.cpp", "qrceditor.h",
+            "resourcefile.cpp", "resourcefile_p.h",
+            "resourceview.cpp", "resourceview.h",
+            "undocommands.cpp", "undocommands_p.h",
+        ]
     }
 }
diff --git a/src/plugins/texteditor/texteditor.qbs b/src/plugins/texteditor/texteditor.qbs
index 0a424aeaa58..76644a13570 100644
--- a/src/plugins/texteditor/texteditor.qbs
+++ b/src/plugins/texteditor/texteditor.qbs
@@ -1,237 +1,234 @@
-import qbs 1.0
 import qbs.FileInfo
 import qbs.Environment
 
-Project {
+QtcPlugin {
     name: "TextEditor"
 
-    QtcPlugin {
-        Depends { name: "Qt"; submodules: ["widgets", "xml", "network", "printsupport"] }
-        Depends { name: "Aggregation" }
-        Depends { name: "Utils" }
+    Depends { name: "Qt"; submodules: ["widgets", "xml", "network", "printsupport"] }
+    Depends { name: "Aggregation" }
+    Depends { name: "Utils" }
+    Depends { name: "KSyntaxHighlighting" }
+
+    Export {
         Depends { name: "KSyntaxHighlighting" }
+    }
 
-        Export {
-            Depends { name: "KSyntaxHighlighting" }
-        }
+    Depends { name: "Core" }
 
-        Depends { name: "Core" }
+    cpp.enableExceptions: true
 
-        cpp.enableExceptions: true
+    files: [
+        "autocompleter.cpp",
+        "autocompleter.h",
+        "basefilefind.cpp",
+        "basefilefind.h",
+        "basehoverhandler.cpp",
+        "basehoverhandler.h",
+        "behaviorsettings.cpp",
+        "behaviorsettings.h",
+        "behaviorsettingspage.cpp",
+        "behaviorsettingspage.h",
+        "behaviorsettingswidget.cpp",
+        "behaviorsettingswidget.h",
+        "blockrange.h",
+        "circularclipboard.cpp",
+        "circularclipboard.h",
+        "circularclipboardassist.cpp",
+        "circularclipboardassist.h",
+        "codecchooser.cpp",
+        "codecchooser.h",
+        "codestyleeditor.cpp",
+        "codestyleeditor.h",
+        "codestylepool.cpp",
+        "codestylepool.h",
+        "codestyleselectorwidget.cpp",
+        "codestyleselectorwidget.h",
+        "colorpreviewhoverhandler.cpp",
+        "colorpreviewhoverhandler.h",
+        "colorscheme.cpp",
+        "colorscheme.h",
+        "colorschemeedit.cpp",
+        "colorschemeedit.h",
+        "command.cpp",
+        "command.h",
+        "commentssettings.cpp",
+        "commentssettings.h",
+        "completionsettings.cpp",
+        "completionsettings.h",
+        "completionsettingspage.cpp",
+        "completionsettingspage.h",
+        "displaysettings.cpp",
+        "displaysettings.h",
+        "displaysettingspage.cpp",
+        "displaysettingspage.h",
+        "extraencodingsettings.cpp",
+        "extraencodingsettings.h",
+        "findincurrentfile.cpp",
+        "findincurrentfile.h",
+        "findinfiles.cpp",
+        "findinfiles.h",
+        "findinopenfiles.cpp",
+        "findinopenfiles.h",
+        "fontsettings.cpp",
+        "fontsettings.h",
+        "fontsettingspage.cpp",
+        "fontsettingspage.h",
+        "formatter.h",
+        "formattexteditor.cpp",
+        "formattexteditor.h",
+        "highlighter.cpp",
+        "highlighter.h",
+        "highlightersettings.cpp",
+        "highlightersettings.h",
+        "highlightersettingspage.cpp",
+        "highlightersettingspage.h",
+        "icodestylepreferences.cpp",
+        "icodestylepreferences.h",
+        "icodestylepreferencesfactory.cpp",
+        "icodestylepreferencesfactory.h",
+        "indenter.h",
+        "ioutlinewidget.h",
+        "jsoneditor.cpp",
+        "jsoneditor.h",
+        "linenumberfilter.cpp",
+        "linenumberfilter.h",
+        "marginsettings.cpp",
+        "marginsettings.h",
+        "markdowneditor.cpp",
+        "markdowneditor.h",
+        "outlinefactory.cpp",
+        "outlinefactory.h",
+        "plaintexteditorfactory.cpp",
+        "plaintexteditorfactory.h",
+        "quickfix.cpp",
+        "quickfix.h",
+        "refactoringchanges.cpp",
+        "refactoringchanges.h",
+        "refactoroverlay.cpp",
+        "refactoroverlay.h",
+        "semantichighlighter.cpp",
+        "semantichighlighter.h",
+        "simplecodestylepreferences.cpp",
+        "simplecodestylepreferences.h",
+        "simplecodestylepreferenceswidget.cpp",
+        "simplecodestylepreferenceswidget.h",
+        "storagesettings.cpp",
+        "storagesettings.h",
+        "syntaxhighlighter.cpp",
+        "syntaxhighlighter.h",
+        "tabsettings.cpp",
+        "tabsettings.h",
+        "tabsettingswidget.cpp",
+        "tabsettingswidget.h",
+        "textdocument.cpp",
+        "textdocument.h",
+        "textdocumentlayout.cpp",
+        "textdocumentlayout.h",
+        "texteditor.cpp",
+        "texteditor.h",
+        "texteditor.qrc",
+        "texteditor_global.h", "texteditortr.h",
+        "texteditor_p.h",
+        "texteditoractionhandler.cpp",
+        "texteditoractionhandler.h",
+        "texteditorconstants.cpp",
+        "texteditorconstants.h",
+        "texteditoroverlay.cpp",
+        "texteditoroverlay.h",
+        "texteditorplugin.cpp",
+        "texteditorplugin.h",
+        "texteditorsettings.cpp",
+        "texteditorsettings.h",
+        "textindenter.cpp",
+        "textindenter.h",
+        "textmark.cpp",
+        "textmark.h",
+        "textstyles.h",
+        "typingsettings.cpp",
+        "typingsettings.h",
+    ]
 
+    Group {
+        name: "CodeAssist"
+        prefix: "codeassist/"
         files: [
-            "autocompleter.cpp",
-            "autocompleter.h",
-            "basefilefind.cpp",
-            "basefilefind.h",
-            "basehoverhandler.cpp",
-            "basehoverhandler.h",
-            "behaviorsettings.cpp",
-            "behaviorsettings.h",
-            "behaviorsettingspage.cpp",
-            "behaviorsettingspage.h",
-            "behaviorsettingswidget.cpp",
-            "behaviorsettingswidget.h",
-            "blockrange.h",
-            "circularclipboard.cpp",
-            "circularclipboard.h",
-            "circularclipboardassist.cpp",
-            "circularclipboardassist.h",
-            "codecchooser.cpp",
-            "codecchooser.h",
-            "codestyleeditor.cpp",
-            "codestyleeditor.h",
-            "codestylepool.cpp",
-            "codestylepool.h",
-            "codestyleselectorwidget.cpp",
-            "codestyleselectorwidget.h",
-            "colorpreviewhoverhandler.cpp",
-            "colorpreviewhoverhandler.h",
-            "colorscheme.cpp",
-            "colorscheme.h",
-            "colorschemeedit.cpp",
-            "colorschemeedit.h",
-            "command.cpp",
-            "command.h",
-            "commentssettings.cpp",
-            "commentssettings.h",
-            "completionsettings.cpp",
-            "completionsettings.h",
-            "completionsettingspage.cpp",
-            "completionsettingspage.h",
-            "displaysettings.cpp",
-            "displaysettings.h",
-            "displaysettingspage.cpp",
-            "displaysettingspage.h",
-            "extraencodingsettings.cpp",
-            "extraencodingsettings.h",
-            "findincurrentfile.cpp",
-            "findincurrentfile.h",
-            "findinfiles.cpp",
-            "findinfiles.h",
-            "findinopenfiles.cpp",
-            "findinopenfiles.h",
-            "fontsettings.cpp",
-            "fontsettings.h",
-            "fontsettingspage.cpp",
-            "fontsettingspage.h",
-            "formatter.h",
-            "formattexteditor.cpp",
-            "formattexteditor.h",
-            "highlighter.cpp",
-            "highlighter.h",
-            "highlightersettings.cpp",
-            "highlightersettings.h",
-            "highlightersettingspage.cpp",
-            "highlightersettingspage.h",
-            "icodestylepreferences.cpp",
-            "icodestylepreferences.h",
-            "icodestylepreferencesfactory.cpp",
-            "icodestylepreferencesfactory.h",
-            "indenter.h",
-            "ioutlinewidget.h",
-            "jsoneditor.cpp",
-            "jsoneditor.h",
-            "linenumberfilter.cpp",
-            "linenumberfilter.h",
-            "marginsettings.cpp",
-            "marginsettings.h",
-            "markdowneditor.cpp",
-            "markdowneditor.h",
-            "outlinefactory.cpp",
-            "outlinefactory.h",
-            "plaintexteditorfactory.cpp",
-            "plaintexteditorfactory.h",
-            "quickfix.cpp",
-            "quickfix.h",
-            "refactoringchanges.cpp",
-            "refactoringchanges.h",
-            "refactoroverlay.cpp",
-            "refactoroverlay.h",
-            "semantichighlighter.cpp",
-            "semantichighlighter.h",
-            "simplecodestylepreferences.cpp",
-            "simplecodestylepreferences.h",
-            "simplecodestylepreferenceswidget.cpp",
-            "simplecodestylepreferenceswidget.h",
-            "storagesettings.cpp",
-            "storagesettings.h",
-            "syntaxhighlighter.cpp",
-            "syntaxhighlighter.h",
-            "tabsettings.cpp",
-            "tabsettings.h",
-            "tabsettingswidget.cpp",
-            "tabsettingswidget.h",
-            "textdocument.cpp",
-            "textdocument.h",
-            "textdocumentlayout.cpp",
-            "textdocumentlayout.h",
-            "texteditor.cpp",
-            "texteditor.h",
-            "texteditor.qrc",
-            "texteditor_global.h", "texteditortr.h",
-            "texteditor_p.h",
-            "texteditoractionhandler.cpp",
-            "texteditoractionhandler.h",
-            "texteditorconstants.cpp",
-            "texteditorconstants.h",
-            "texteditoroverlay.cpp",
-            "texteditoroverlay.h",
-            "texteditorplugin.cpp",
-            "texteditorplugin.h",
-            "texteditorsettings.cpp",
-            "texteditorsettings.h",
-            "textindenter.cpp",
-            "textindenter.h",
-            "textmark.cpp",
-            "textmark.h",
-            "textstyles.h",
-            "typingsettings.cpp",
-            "typingsettings.h",
+            "assistenums.h",
+            "assistinterface.cpp",
+            "assistinterface.h",
+            "assistproposalitem.cpp",
+            "assistproposalitem.h",
+            "assistproposaliteminterface.h",
+            "asyncprocessor.cpp",
+            "asyncprocessor.h",
+            "codeassistant.cpp",
+            "codeassistant.h",
+            "completionassistprovider.cpp",
+            "completionassistprovider.h",
+            "documentcontentcompletion.cpp",
+            "documentcontentcompletion.h",
+            "functionhintproposal.cpp",
+            "functionhintproposal.h",
+            "functionhintproposalwidget.cpp",
+            "functionhintproposalwidget.h",
+            "genericproposal.cpp",
+            "genericproposal.h",
+            "genericproposalmodel.cpp",
+            "genericproposalmodel.h",
+            "genericproposalwidget.cpp",
+            "genericproposalwidget.h",
+            "iassistprocessor.cpp",
+            "iassistprocessor.h",
+            "iassistproposal.cpp",
+            "iassistproposal.h",
+            "iassistproposalmodel.cpp",
+            "iassistproposalmodel.h",
+            "iassistproposalwidget.cpp",
+            "iassistproposalwidget.h",
+            "iassistprovider.cpp",
+            "iassistprovider.h",
+            "ifunctionhintproposalmodel.cpp",
+            "ifunctionhintproposalmodel.h",
+            "keywordscompletionassist.cpp",
+            "keywordscompletionassist.h",
+            "textdocumentmanipulator.cpp",
+            "textdocumentmanipulator.h",
+            "textdocumentmanipulatorinterface.h",
         ]
+    }
 
-        Group {
-            name: "CodeAssist"
-            prefix: "codeassist/"
-            files: [
-                "assistenums.h",
-                "assistinterface.cpp",
-                "assistinterface.h",
-                "assistproposalitem.cpp",
-                "assistproposalitem.h",
-                "assistproposaliteminterface.h",
-                "asyncprocessor.cpp",
-                "asyncprocessor.h",
-                "codeassistant.cpp",
-                "codeassistant.h",
-                "completionassistprovider.cpp",
-                "completionassistprovider.h",
-                "documentcontentcompletion.cpp",
-                "documentcontentcompletion.h",
-                "functionhintproposal.cpp",
-                "functionhintproposal.h",
-                "functionhintproposalwidget.cpp",
-                "functionhintproposalwidget.h",
-                "genericproposal.cpp",
-                "genericproposal.h",
-                "genericproposalmodel.cpp",
-                "genericproposalmodel.h",
-                "genericproposalwidget.cpp",
-                "genericproposalwidget.h",
-                "iassistprocessor.cpp",
-                "iassistprocessor.h",
-                "iassistproposal.cpp",
-                "iassistproposal.h",
-                "iassistproposalmodel.cpp",
-                "iassistproposalmodel.h",
-                "iassistproposalwidget.cpp",
-                "iassistproposalwidget.h",
-                "iassistprovider.cpp",
-                "iassistprovider.h",
-                "ifunctionhintproposalmodel.cpp",
-                "ifunctionhintproposalmodel.h",
-                "keywordscompletionassist.cpp",
-                "keywordscompletionassist.h",
-                "textdocumentmanipulator.cpp",
-                "textdocumentmanipulator.h",
-                "textdocumentmanipulatorinterface.h",
-            ]
-        }
+    Group {
+        name: "Snippets"
+        prefix: "snippets/"
+        files: [
+            "reuse.h",
+            "snippet.cpp",
+            "snippet.h",
+            "snippetassistcollector.cpp",
+            "snippetassistcollector.h",
+            "snippeteditor.cpp",
+            "snippeteditor.h",
+            "snippetoverlay.cpp",
+            "snippetoverlay.h",
+            "snippetparser.cpp",
+            "snippetparser.h",
+            "snippetprovider.cpp",
+            "snippetprovider.h",
+            "snippetscollection.cpp",
+            "snippetscollection.h",
+            "snippetssettings.cpp",
+            "snippetssettings.h",
+            "snippetssettingspage.cpp",
+            "snippetssettingspage.h",
+        ]
+    }
 
-        Group {
-            name: "Snippets"
-            prefix: "snippets/"
-            files: [
-                "reuse.h",
-                "snippet.cpp",
-                "snippet.h",
-                "snippetassistcollector.cpp",
-                "snippetassistcollector.h",
-                "snippeteditor.cpp",
-                "snippeteditor.h",
-                "snippetoverlay.cpp",
-                "snippetoverlay.h",
-                "snippetparser.cpp",
-                "snippetparser.h",
-                "snippetprovider.cpp",
-                "snippetprovider.h",
-                "snippetscollection.cpp",
-                "snippetscollection.h",
-                "snippetssettings.cpp",
-                "snippetssettings.h",
-                "snippetssettingspage.cpp",
-                "snippetssettingspage.h",
-            ]
-        }
-
-        QtcTestFiles {
-            files: [
-                "codeassist/codeassist_test.cpp",
-                "codeassist/codeassist_test.h",
-                "highlighter_test.cpp",
-                "highlighter_test.h",
-                "texteditor_test.cpp",
-            ]
-        }
+    QtcTestFiles {
+        files: [
+            "codeassist/codeassist_test.cpp",
+            "codeassist/codeassist_test.h",
+            "highlighter_test.cpp",
+            "highlighter_test.h",
+            "texteditor_test.cpp",
+        ]
     }
 }