diff --git a/lib/qtcreator/qtcomponents/qtcomponents.qbs b/lib/qtcreator/qtcomponents/qtcomponents.qbs
index 7453269b6c142fbaaa51fe06dae372a5f259a2f9..b7f81c62cd4119bc2277e8578e8308bfef6d1544 100644
--- a/lib/qtcreator/qtcomponents/qtcomponents.qbs
+++ b/lib/qtcreator/qtcomponents/qtcomponents.qbs
@@ -51,13 +51,13 @@ Product {
             "ButtonRow.qml",
             "CheckBox.qml",
             "ChoiceList.qml",
-            "components.pro",
             "GroupBox.qml",
             "ProgressBar.qml",
             "Slider.qml",
             "SpinBox.qml",
             "SplitterRow.qml",
             "TextField.qml",
+            "components.pro",
             "qmldir",
         ]
     }
diff --git a/src/libs/aggregation/aggregation.qbs b/src/libs/aggregation/aggregation.qbs
index 1c81766995821ba2ac6f9d281a61052dc982427b..5b64ea423fadac08fe5176ae20b5fb1e15b410d2 100644
--- a/src/libs/aggregation/aggregation.qbs
+++ b/src/libs/aggregation/aggregation.qbs
@@ -14,8 +14,8 @@ QtcLibrary {
     Depends { name: "Qt.core" }
 
     files: [
-        "aggregation_global.h",
+        "aggregate.cpp",
         "aggregate.h",
-        "aggregate.cpp"
+        "aggregation_global.h",
     ]
 }
diff --git a/src/libs/cplusplus/cplusplus.qbs b/src/libs/cplusplus/cplusplus.qbs
index 6038fc6a2c4a9aaace72ec940aabc3b502ba1e16..7b9e98d04ac80dfe5c7157ef398bf0fdaf43901b 100644
--- a/src/libs/cplusplus/cplusplus.qbs
+++ b/src/libs/cplusplus/cplusplus.qbs
@@ -22,13 +22,21 @@ QtcLibrary {
     Group {
         prefix: "../3rdparty/cplusplus/"
         files: [
+            "AST.cpp",
+            "AST.h",
+            "ASTClone.cpp",
+            "ASTMatch0.cpp",
+            "ASTMatcher.cpp",
+            "ASTMatcher.h",
             "ASTPatternBuilder.cpp",
-            "CPlusPlus.h",
-            "LiteralTable.cpp",
-            "ObjectiveCTypeQualifiers.h",
-            "Templates.cpp",
-            "Templates.h",
+            "ASTPatternBuilder.h",
+            "ASTVisit.cpp",
             "ASTVisitor.cpp",
+            "ASTVisitor.h",
+            "ASTfwd.h",
+            "Bind.cpp",
+            "Bind.h",
+            "CPlusPlus.h",
             "Control.cpp",
             "Control.h",
             "CoreTypes.cpp",
@@ -37,8 +45,12 @@ QtcLibrary {
             "DiagnosticClient.h",
             "FullySpecifiedType.cpp",
             "FullySpecifiedType.h",
+            "Keywords.cpp",
+            "Lexer.cpp",
             "Lexer.h",
+            "LiteralTable.cpp",
             "LiteralTable.h",
+            "Literals.cpp",
             "Literals.h",
             "MemoryPool.cpp",
             "MemoryPool.h",
@@ -50,48 +62,35 @@ QtcLibrary {
             "Names.h",
             "ObjectiveCAtKeywords.cpp",
             "ObjectiveCTypeQualifiers.cpp",
+            "ObjectiveCTypeQualifiers.h",
+            "Parser.cpp",
+            "Parser.h",
+            "QtContextKeywords.cpp",
+            "QtContextKeywords.h",
             "Scope.cpp",
             "Scope.h",
+            "Symbol.cpp",
+            "Symbol.h",
             "SymbolVisitor.cpp",
             "SymbolVisitor.h",
+            "Symbols.cpp",
             "Symbols.h",
+            "Templates.cpp",
+            "Templates.h",
+            "Token.cpp",
+            "Token.h",
+            "TranslationUnit.cpp",
+            "TranslationUnit.h",
             "Type.cpp",
             "Type.h",
             "TypeMatcher.cpp",
             "TypeMatcher.h",
             "TypeVisitor.cpp",
             "TypeVisitor.h",
-            "AST.cpp",
-            "AST.h",
-            "ASTClone.cpp",
-            "ASTMatch0.cpp",
-            "ASTMatcher.cpp",
-            "ASTMatcher.h",
-            "ASTPatternBuilder.h",
-            "ASTVisit.cpp",
-            "ASTVisitor.h",
-            "ASTfwd.h",
-            "Bind.cpp",
-            "Bind.h",
-            "Keywords.cpp",
-            "Lexer.cpp",
-            "Literals.cpp",
-            "Parser.cpp",
-            "Parser.h",
-            "QtContextKeywords.cpp",
-            "QtContextKeywords.h",
-            "Symbol.cpp",
-            "Symbol.h",
-            "Symbols.cpp",
-            "Token.cpp",
-            "Token.h",
-            "TranslationUnit.cpp",
-            "TranslationUnit.h"
         ]
     }
 
     files: [
-        "cplusplus.qrc",
         "ASTParent.cpp",
         "ASTParent.h",
         "ASTPath.cpp",
@@ -128,6 +127,8 @@ QtcLibrary {
         "Overview.h",
         "OverviewModel.cpp",
         "OverviewModel.h",
+        "PPToken.cpp",
+        "PPToken.h",
         "PreprocessorClient.cpp",
         "PreprocessorClient.h",
         "PreprocessorEnvironment.cpp",
@@ -144,13 +145,12 @@ QtcLibrary {
         "TypeOfExpression.h",
         "TypePrettyPrinter.cpp",
         "TypePrettyPrinter.h",
+        "cplusplus.qrc",
         "findcdbbreakpoint.cpp",
         "findcdbbreakpoint.h",
         "pp-cctype.h",
         "pp-engine.cpp",
         "pp-engine.h",
-        "PPToken.cpp",
-        "PPToken.h",
         "pp-scanner.cpp",
         "pp-scanner.h",
         "pp.h",
@@ -169,7 +169,7 @@ QtcLibrary {
         "images/slot_prot.png",
         "images/var.png",
         "images/var_priv.png",
-        "images/var_prot.png"
+        "images/var_prot.png",
     ]
 
     ProductModule {
diff --git a/src/libs/extensionsystem/extensionsystem.qbs b/src/libs/extensionsystem/extensionsystem.qbs
index bbdd8b74b312d3f84f7a7109a7fa083cc2f0a704..56f9b48422414bea1a28feb67b08542a881d11a9 100644
--- a/src/libs/extensionsystem/extensionsystem.qbs
+++ b/src/libs/extensionsystem/extensionsystem.qbs
@@ -18,10 +18,6 @@ QtcLibrary {
     Depends { name: "Aggregation" }
 
     files: [
-        "plugindetailsview.ui",
-        "pluginerrorview.ui",
-        "pluginview.qrc",
-        "pluginview.ui",
         "extensionsystem_global.h",
         "invoker.cpp",
         "invoker.h",
@@ -34,19 +30,23 @@ QtcLibrary {
         "plugincollection.h",
         "plugindetailsview.cpp",
         "plugindetailsview.h",
+        "plugindetailsview.ui",
         "pluginerroroverview.cpp",
         "pluginerroroverview.h",
         "pluginerroroverview.ui",
         "pluginerrorview.cpp",
         "pluginerrorview.h",
+        "pluginerrorview.ui",
         "pluginmanager.cpp",
         "pluginmanager.h",
         "pluginmanager_p.h",
+        "pluginspec.cpp",
         "pluginspec.h",
         "pluginspec_p.h",
         "pluginview.cpp",
         "pluginview.h",
-        "pluginspec.cpp",
+        "pluginview.qrc",
+        "pluginview.ui",
         "images/error.png",
         "images/notloaded.png",
         "images/ok.png",
diff --git a/src/libs/glsl/glsl.qbs b/src/libs/glsl/glsl.qbs
index 7ee3557673dbd341d897b855f23be03b0ac2b273..edffdb4da59f0e3e074f703e5da40f6e595a9f96 100644
--- a/src/libs/glsl/glsl.qbs
+++ b/src/libs/glsl/glsl.qbs
@@ -17,35 +17,35 @@ QtcLibrary {
     Depends { name: "Qt.gui" }
 
     files: [
+        "glsl.g",
         "glsl.h",
-        "glsllexer.h",
-        "glslparser.h",
-        "glslparsertable_p.h",
+        "glslast.cpp",
         "glslast.h",
+        "glslastdump.cpp",
+        "glslastdump.h",
+        "glslastvisitor.cpp",
         "glslastvisitor.h",
+        "glslengine.cpp",
         "glslengine.h",
-        "glslmemorypool.h",
-        "glslastdump.h",
-        "glslsemantic.h",
-        "glsltype.h",
-        "glsltypes.h",
-        "glslsymbol.h",
-        "glslsymbols.h",
         "glslkeywords.cpp",
-        "glslparser.cpp",
-        "glslparsertable.cpp",
         "glsllexer.cpp",
-        "glslast.cpp",
-        "glslastvisitor.cpp",
-        "glslengine.cpp",
+        "glsllexer.h",
         "glslmemorypool.cpp",
-        "glslastdump.cpp",
+        "glslmemorypool.h",
+        "glslparser.cpp",
+        "glslparser.h",
+        "glslparsertable.cpp",
+        "glslparsertable_p.h",
         "glslsemantic.cpp",
-        "glsltype.cpp",
-        "glsltypes.cpp",
+        "glslsemantic.h",
         "glslsymbol.cpp",
+        "glslsymbol.h",
         "glslsymbols.cpp",
-        "glsl.g"
+        "glslsymbols.h",
+        "glsltype.cpp",
+        "glsltype.h",
+        "glsltypes.cpp",
+        "glsltypes.h",
     ]
 
     ProductModule {
diff --git a/src/libs/languageutils/languageutils.qbs b/src/libs/languageutils/languageutils.qbs
index abd23f95c86e7b6ab90ccd98b65b6c0675bd3e7c..0a4b2fc061952d4a358455cc9a95108e1f92a163 100644
--- a/src/libs/languageutils/languageutils.qbs
+++ b/src/libs/languageutils/languageutils.qbs
@@ -19,11 +19,11 @@ QtcLibrary {
     Depends { name: "Qt.core" }
 
     files: [
-        "languageutils_global.h",
-        "fakemetaobject.h",
+        "componentversion.cpp",
         "componentversion.h",
         "fakemetaobject.cpp",
-        "componentversion.cpp"
+        "fakemetaobject.h",
+        "languageutils_global.h",
     ]
 }
 
diff --git a/src/libs/qmldebug/qmldebug.qbs b/src/libs/qmldebug/qmldebug.qbs
index c9fa8c01a4dac189f73daf9318639c6589466223..f3269e3ec2e18d4bf701d35d81b5b342b971d2aa 100644
--- a/src/libs/qmldebug/qmldebug.qbs
+++ b/src/libs/qmldebug/qmldebug.qbs
@@ -25,24 +25,24 @@ QtcLibrary {
         "declarativetoolsclient.h",
         "qdebugmessageclient.cpp",
         "qdebugmessageclient.h",
+        "qmldebug_global.h",
         "qmldebugclient.cpp",
         "qmldebugclient.h",
         "qmldebugconstants.h",
-        "qmldebug_global.h",
+        "qmlenginedebugclient.cpp",
+        "qmlenginedebugclient.h",
         "qmloutputparser.cpp",
         "qmloutputparser.h",
         "qmlprofilereventlocation.h",
         "qmlprofilereventtypes.h",
         "qmlprofilertraceclient.cpp",
         "qmlprofilertraceclient.h",
+        "qmltoolsclient.cpp",
+        "qmltoolsclient.h",
         "qpacketprotocol.cpp",
         "qpacketprotocol.h",
-        "qmlenginedebugclient.cpp",
-        "qmlenginedebugclient.h",
         "qv8profilerclient.cpp",
         "qv8profilerclient.h",
-        "qmltoolsclient.cpp",
-        "qmltoolsclient.h"
     ]
 
     ProductModule {
diff --git a/src/libs/qmleditorwidgets/qmleditorwidgets.qbs b/src/libs/qmleditorwidgets/qmleditorwidgets.qbs
index 4d88000d507a4f5da02c0c6d549e0ca2858c7bb2..09130aa9ccd8727f369e8d4517ee8553d1149a24 100644
--- a/src/libs/qmleditorwidgets/qmleditorwidgets.qbs
+++ b/src/libs/qmleditorwidgets/qmleditorwidgets.qbs
@@ -22,42 +22,42 @@ QtcLibrary {
     Depends { name: "Utils" }
 
     files: [
-        "resources.qrc",
-        "fontsizespinbox.h",
-        "filewidget.h",
-        "contextpanewidgetrectangle.h",
-        "contextpanewidgetimage.h",
-        "contextpanewidget.h",
-        "contextpanetextwidget.h",
-        "colorwidgets.h",
-        "colorbutton.h",
+        "colorbox.cpp",
         "colorbox.h",
+        "colorbutton.cpp",
+        "colorbutton.h",
+        "colorwidgets.cpp",
+        "colorwidgets.h",
+        "contextpanetext.ui",
+        "contextpanetextwidget.cpp",
+        "contextpanetextwidget.h",
+        "contextpanewidget.cpp",
+        "contextpanewidget.h",
+        "contextpanewidgetborderimage.ui",
+        "contextpanewidgetimage.cpp",
+        "contextpanewidgetimage.h",
+        "contextpanewidgetimage.ui",
+        "contextpanewidgetrectangle.cpp",
+        "contextpanewidgetrectangle.h",
+        "contextpanewidgetrectangle.ui",
+        "customcolordialog.cpp",
         "customcolordialog.h",
+        "filewidget.cpp",
+        "filewidget.h",
+        "fontsizespinbox.cpp",
+        "fontsizespinbox.h",
+        "gradientline.cpp",
         "gradientline.h",
+        "huecontrol.cpp",
         "huecontrol.h",
         "qmleditorwidgets_global.h",
-        "fontsizespinbox.cpp",
-        "filewidget.cpp",
-        "contextpanewidgetrectangle.cpp",
-        "contextpanewidgetimage.cpp",
-        "contextpanewidget.cpp",
-        "contextpanetextwidget.cpp",
-        "colorwidgets.cpp",
-        "colorbox.cpp",
-        "customcolordialog.cpp",
-        "huecontrol.cpp",
-        "gradientline.cpp",
-        "colorbutton.cpp",
-        "contextpanewidgetrectangle.ui",
-        "contextpanewidgetimage.ui",
-        "contextpanewidgetborderimage.ui",
-        "contextpanetext.ui",
-        "easingpane/easinggraph.cpp",
+        "resources.qrc",
         "easingpane/easingcontextpane.cpp",
-        "easingpane/easinggraph.h",
         "easingpane/easingcontextpane.h",
+        "easingpane/easingcontextpane.ui",
+        "easingpane/easinggraph.cpp",
+        "easingpane/easinggraph.h",
         "easingpane/easingpane.qrc",
-        "easingpane/easingcontextpane.ui"
     ]
 
     ProductModule {
diff --git a/src/libs/qmljs/qmljs.qbs b/src/libs/qmljs/qmljs.qbs
index d7b556b06bdb8496ba950d72a9361a40f2d040f3..5e5b162138541bc58166316ad75d269ff5ad11aa 100644
--- a/src/libs/qmljs/qmljs.qbs
+++ b/src/libs/qmljs/qmljs.qbs
@@ -21,6 +21,8 @@ QtcLibrary {
     Depends { name: "Qt"; submodules: ["widgets", "script"] }
 
     files: [
+        "jsoncheck.cpp",
+        "jsoncheck.h",
         "qmljs.qrc",
         "qmljs_global.h",
         "qmljsbind.cpp",
@@ -55,6 +57,7 @@ QtcLibrary {
         "qmljspropertyreader.cpp",
         "qmljspropertyreader.h",
         "qmljsreformatter.cpp",
+        "qmljsreformatter.h",
         "qmljsrewriter.cpp",
         "qmljsrewriter.h",
         "qmljsscanner.cpp",
@@ -73,9 +76,6 @@ QtcLibrary {
         "qmljsutils.h",
         "qmljsvalueowner.cpp",
         "qmljsvalueowner.h",
-        "qmljsreformatter.h",
-        "jsoncheck.cpp",
-        "jsoncheck.h",
         "images/element.png",
         "images/func.png",
         "images/property.png",
@@ -99,7 +99,7 @@ QtcLibrary {
         "parser/qmljslexer_p.h",
         "parser/qmljsmemorypool_p.h",
         "parser/qmljsparser.cpp",
-        "parser/qmljsparser_p.h"
+        "parser/qmljsparser_p.h",
     ]
 
     ProductModule {
diff --git a/src/libs/qtcomponents/styleitem/styleitem.qbs b/src/libs/qtcomponents/styleitem/styleitem.qbs
index d06a8cc43e2e9cfe11896c74c21d0b3c2546f0ef..f633b59c47cdf8cfe7270db35a52857fc06f1efb 100644
--- a/src/libs/qtcomponents/styleitem/styleitem.qbs
+++ b/src/libs/qtcomponents/styleitem/styleitem.qbs
@@ -27,7 +27,7 @@ DynamicLibrary {
         "qtmenuitem.cpp",
         "qtmenuitem.h",
         "qwheelarea.cpp",
-        "qwheelarea.h"
+        "qwheelarea.h",
     ]
 }
 
diff --git a/src/libs/ssh/ssh.qbs b/src/libs/ssh/ssh.qbs
index f3010b15761dda584e28035736c301eef544e347..116cf08a1555f3d941ad2bd1498980935e60ed6b 100644
--- a/src/libs/ssh/ssh.qbs
+++ b/src/libs/ssh/ssh.qbs
@@ -19,34 +19,34 @@ QtcLibrary {
     files: [
         "sftpchannel.h", "sftpchannel_p.h", "sftpchannel.cpp",
         "sftpdefs.cpp", "sftpdefs.h",
+        "sftpfilesystemmodel.cpp", "sftpfilesystemmodel.h",
         "sftpincomingpacket.cpp", "sftpincomingpacket_p.h",
         "sftpoperation.cpp", "sftpoperation_p.h",
         "sftpoutgoingpacket.cpp", "sftpoutgoingpacket_p.h",
         "sftppacket.cpp", "sftppacket_p.h",
+        "sshbotanconversions_p.h",
         "sshcapabilities_p.h", "sshcapabilities.cpp",
         "sshchannel.cpp", "sshchannel_p.h",
         "sshchannelmanager.cpp", "sshchannelmanager_p.h",
         "sshconnection.h", "sshconnection_p.h", "sshconnection.cpp",
         "sshconnectionmanager.cpp", "sshconnectionmanager.h",
         "sshcryptofacility.cpp", "sshcryptofacility_p.h",
+        "sshdirecttcpiptunnel.h", "sshdirecttcpiptunnel_p.h", "sshdirecttcpiptunnel.cpp",
+        "ssherrors.h",
+        "sshexception_p.h",
+        "sshincomingpacket_p.h", "sshincomingpacket.cpp",
+        "sshkeycreationdialog.cpp", "sshkeycreationdialog.h", "sshkeycreationdialog.ui",
         "sshkeyexchange.cpp", "sshkeyexchange_p.h",
+        "sshkeygenerator.cpp", "sshkeygenerator.h",
+        "sshkeypasswordretriever.cpp",
         "sshkeypasswordretriever_p.h",
         "sshoutgoingpacket.cpp", "sshoutgoingpacket_p.h",
         "sshpacket.cpp", "sshpacket_p.h",
         "sshpacketparser.cpp", "sshpacketparser_p.h",
+        "sshpseudoterminal.h",
         "sshremoteprocess.cpp", "sshremoteprocess.h", "sshremoteprocess_p.h",
-        "sshdirecttcpiptunnel.h", "sshdirecttcpiptunnel_p.h", "sshdirecttcpiptunnel.cpp",
         "sshremoteprocessrunner.cpp", "sshremoteprocessrunner.h",
         "sshsendfacility.cpp", "sshsendfacility_p.h",
-        "sshkeypasswordretriever.cpp",
-        "sshkeygenerator.cpp", "sshkeygenerator.h",
-        "sshkeycreationdialog.cpp", "sshkeycreationdialog.h", "sshkeycreationdialog.ui",
-        "sftpfilesystemmodel.cpp", "sftpfilesystemmodel.h",
-        "sshincomingpacket_p.h", "sshincomingpacket.cpp",
-        "ssherrors.h",
-        "sshexception_p.h",
-        "sshpseudoterminal.h",
-        "sshbotanconversions_p.h"
     ]
 
     ProductModule {
diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs
index 9a406d2c7ae175221c2a78d170f66a18cb899e71..99eacdb1fbf4dfaee1a7dd00eb1cf9a6bc0cb711 100644
--- a/src/libs/utils/utils.qbs
+++ b/src/libs/utils/utils.qbs
@@ -30,21 +30,22 @@ QtcLibrary {
     Depends { name: "app_version_header" }
 
     files: [
-        "filewizardpage.ui",
-        "newclasswidget.ui",
-        "projectintropage.ui",
-        "utils.qrc",
         "annotateditemdelegate.cpp",
         "annotateditemdelegate.h",
+        "appmainwindow.cpp",
+        "appmainwindow.h",
         "basetreeview.cpp",
         "basetreeview.h",
         "basevalidatinglineedit.cpp",
         "basevalidatinglineedit.h",
         "bracematcher.cpp",
         "bracematcher.h",
+        "buildablehelperlibrary.cpp",
         "buildablehelperlibrary.h",
         "changeset.cpp",
         "changeset.h",
+        "checkablemessagebox.cpp",
+        "checkablemessagebox.h",
         "classnamevalidatinglineedit.cpp",
         "classnamevalidatinglineedit.h",
         "codegeneration.cpp",
@@ -54,6 +55,7 @@ QtcLibrary {
         "consoleprocess.cpp",
         "consoleprocess.h",
         "consoleprocess_p.h",
+        "crumblepath.cpp",
         "crumblepath.h",
         "detailsbutton.cpp",
         "detailsbutton.h",
@@ -61,6 +63,7 @@ QtcLibrary {
         "detailswidget.h",
         "elfreader.cpp",
         "elfreader.h",
+        "environment.cpp",
         "environment.h",
         "environmentmodel.cpp",
         "environmentmodel.h",
@@ -70,27 +73,31 @@ QtcLibrary {
         "fancylineedit.h",
         "fancymainwindow.cpp",
         "fancymainwindow.h",
-        "appmainwindow.h",
-        "appmainwindow.cpp",
         "fileinprojectfinder.cpp",
         "fileinprojectfinder.h",
+        "filenamevalidatinglineedit.cpp",
         "filenamevalidatinglineedit.h",
         "filesearch.cpp",
         "filesearch.h",
         "filesystemwatcher.cpp",
         "filesystemwatcher.h",
+        "fileutils.cpp",
         "fileutils.h",
         "filewizarddialog.cpp",
         "filewizarddialog.h",
         "filewizardpage.cpp",
         "filewizardpage.h",
+        "filewizardpage.ui",
         "filterlineedit.cpp",
         "filterlineedit.h",
         "flowlayout.cpp",
         "flowlayout.h",
+        "historycompleter.cpp",
         "historycompleter.h",
+        "hostosinfo.h",
         "htmldocextractor.cpp",
         "htmldocextractor.h",
+        "ipaddresslineedit.cpp",
         "ipaddresslineedit.h",
         "iwelcomepage.cpp",
         "iwelcomepage.h",
@@ -99,11 +106,14 @@ QtcLibrary {
         "linecolumnlabel.cpp",
         "linecolumnlabel.h",
         "listutils.h",
+        "multitask.h",
         "navigationtreeview.cpp",
         "navigationtreeview.h",
+        "networkaccessmanager.cpp",
         "networkaccessmanager.h",
         "newclasswidget.cpp",
         "newclasswidget.h",
+        "newclasswidget.ui",
         "outputformat.h",
         "outputformatter.cpp",
         "outputformatter.h",
@@ -111,23 +121,34 @@ QtcLibrary {
         "parameteraction.h",
         "pathchooser.cpp",
         "pathchooser.h",
+        "pathlisteditor.cpp",
         "pathlisteditor.h",
+        "persistentsettings.cpp",
+        "persistentsettings.h",
+        "portlist.cpp",
+        "portlist.h",
         "projectintropage.cpp",
         "projectintropage.h",
+        "projectintropage.ui",
         "projectnamevalidatinglineedit.cpp",
         "projectnamevalidatinglineedit.h",
+        "proxyaction.cpp",
         "proxyaction.h",
-        "qtcassert.h",
         "qtcassert.cpp",
+        "qtcassert.h",
         "qtcolorbutton.cpp",
         "qtcolorbutton.h",
+        "qtcprocess.cpp",
         "qtcprocess.h",
         "reloadpromptutils.cpp",
         "reloadpromptutils.h",
+        "runextensions.h",
+        "savedaction.cpp",
         "savedaction.h",
         "savefile.cpp",
         "savefile.h",
         "settingsselector.cpp",
+        "settingsselector.h",
         "settingsutils.h",
         "statuslabel.cpp",
         "statuslabel.h",
@@ -135,6 +156,7 @@ QtcLibrary {
         "stringutils.h",
         "styledbar.cpp",
         "styledbar.h",
+        "stylehelper.cpp",
         "stylehelper.h",
         "submiteditorwidget.cpp",
         "submiteditorwidget.h",
@@ -151,32 +173,10 @@ QtcLibrary {
         "treewidgetcolumnstretcher.h",
         "uncommentselection.cpp",
         "uncommentselection.h",
+        "utils.qrc",
         "utils_global.h",
         "wizard.cpp",
         "wizard.h",
-        "hostosinfo.h",
-        "persistentsettings.h",
-        "settingsselector.h",
-        "buildablehelperlibrary.cpp",
-        "checkablemessagebox.cpp",
-        "checkablemessagebox.h",
-        "crumblepath.cpp",
-        "environment.cpp",
-        "filenamevalidatinglineedit.cpp",
-        "fileutils.cpp",
-        "historycompleter.cpp",
-        "ipaddresslineedit.cpp",
-        "networkaccessmanager.cpp",
-        "pathlisteditor.cpp",
-        "persistentsettings.cpp",
-        "portlist.cpp",
-        "portlist.h",
-        "proxyaction.cpp",
-        "qtcprocess.cpp",
-        "savedaction.cpp",
-        "stylehelper.cpp",
-        "multitask.h",
-        "runextensions.h",
         "images/arrow.png",
         "images/crumblepath-segment-end.png",
         "images/crumblepath-segment-hover-end.png",
@@ -207,8 +207,8 @@ QtcLibrary {
     Group {
         condition: qbs.targetOS == "linux"
         files: [
+            "unixutils.cpp",
             "unixutils.h",
-            "unixutils.cpp"
         ]
     }
 
diff --git a/src/libs/zeroconf/zeroconf.qbs b/src/libs/zeroconf/zeroconf.qbs
index fcc98878a150cd9d050b0259793ecbb0ff533f91..83a32463c27278b55548f103d180b368c420333f 100644
--- a/src/libs/zeroconf/zeroconf.qbs
+++ b/src/libs/zeroconf/zeroconf.qbs
@@ -26,17 +26,17 @@ QtcLibrary {
     }
 
     files: [
-        "servicebrowser.cpp",
-        "servicebrowser.h",
-        "servicebrowser_p.h",
-        "embeddedLib.cpp",
-        "mdnsderived.cpp",
-        "mdnsderived.h",
         "avahiLib.cpp",
         "dnsSdLib.cpp",
         "dns_sd_types.h",
+        "embeddedLib.cpp",
+        "mdnsderived.cpp",
+        "mdnsderived.h",
+        "servicebrowser.cpp",
+        "servicebrowser.h",
+        "servicebrowser_p.h",
+        "syssocket.h",
         "zeroconf_global.h",
-        "syssocket.h"
     ]
 
     ProductModule {
diff --git a/src/plugins/analyzerbase/analyzerbase.qbs b/src/plugins/analyzerbase/analyzerbase.qbs
index 7fada29a11e5912a64948b6d4550e72ffdb190b2..eb89035109526d5cb26589e8c437101d99b9e5a6 100644
--- a/src/plugins/analyzerbase/analyzerbase.qbs
+++ b/src/plugins/analyzerbase/analyzerbase.qbs
@@ -27,13 +27,18 @@ QtcPlugin {
         "analyzerbase.qrc",
         "analyzerbase_global.h",
         "analyzerconstants.h",
+        "analyzermanager.cpp",
+        "analyzermanager.h",
         "analyzeroptionspage.cpp",
         "analyzeroptionspage.h",
         "analyzerplugin.cpp",
         "analyzerplugin.h",
         "analyzerrunconfigwidget.cpp",
         "analyzerrunconfigwidget.h",
+        "analyzerruncontrol.cpp",
         "analyzerruncontrol.h",
+        "analyzerruncontrolfactory.cpp",
+        "analyzerruncontrolfactory.h",
         "analyzersettings.cpp",
         "analyzersettings.h",
         "analyzerstartparameters.h",
@@ -42,17 +47,12 @@ QtcPlugin {
         "ianalyzerengine.cpp",
         "ianalyzerengine.h",
         "ianalyzertool.cpp",
+        "ianalyzertool.h",
         "startremotedialog.cpp",
         "startremotedialog.h",
-        "analyzermanager.cpp",
-        "analyzermanager.h",
-        "analyzerruncontrol.cpp",
-        "analyzerruncontrolfactory.cpp",
-        "analyzerruncontrolfactory.h",
-        "ianalyzertool.h",
         "images/analyzer_category.png",
         "images/analyzer_mode.png",
-        "images/analyzer_start_small.png"
+        "images/analyzer_start_small.png",
     ]
 
     ProductModule {
diff --git a/src/plugins/android/android.qbs b/src/plugins/android/android.qbs
index d719b78309e417f62681eb373d9fdbe627f7045e..618d83a5c8e393e54550402f56c183366e253efe 100644
--- a/src/plugins/android/android.qbs
+++ b/src/plugins/android/android.qbs
@@ -24,6 +24,7 @@ QtcPlugin {
 
     files: [
         "addnewavddialog.ui",
+        "android.qrc",
         "androidconfigurations.cpp",
         "androidconfigurations.h",
         "androidconstants.h",
@@ -35,9 +36,9 @@ QtcPlugin {
         "androiddeployconfiguration.cpp",
         "androiddeployconfiguration.h",
         "androiddeploystep.cpp",
+        "androiddeploystep.h",
         "androiddeploystepfactory.cpp",
         "androiddeploystepfactory.h",
-        "androiddeploystep.h",
         "androiddeploystepwidget.cpp",
         "androiddeploystepwidget.h",
         "androiddeploystepwidget.ui",
@@ -46,8 +47,8 @@ QtcPlugin {
         "androiddevicefactory.cpp",
         "androiddevicefactory.h",
         "androidglobal.h",
-        "androidmanager.h",
         "androidmanager.cpp",
+        "androidmanager.h",
         "androidpackagecreationfactory.cpp",
         "androidpackagecreationfactory.h",
         "androidpackagecreationstep.cpp",
@@ -61,11 +62,10 @@ QtcPlugin {
         "androidpackageinstallationstep.h",
         "androidplugin.cpp",
         "androidplugin.h",
-        "android.qrc",
         "androidqtversion.cpp",
+        "androidqtversion.h",
         "androidqtversionfactory.cpp",
         "androidqtversionfactory.h",
-        "androidqtversion.h",
         "androidrunconfiguration.cpp",
         "androidrunconfiguration.h",
         "androidruncontrol.cpp",
@@ -82,6 +82,6 @@ QtcPlugin {
         "androidtoolchain.cpp",
         "androidtoolchain.h",
         "javaparser.cpp",
-        "javaparser.h"
+        "javaparser.h",
     ]
 }
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.qbs b/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.qbs
index 78d4a6ab539ac92ec59a5ade66a931ac1f846d4e..00222dd2721292e93724f38079775c11808465c5 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.qbs
+++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.qbs
@@ -50,6 +50,6 @@ QtcPlugin {
         "makefileparserthread.cpp",
         "makefileparserthread.h",
         "makestep.cpp",
-        "makestep.h"
+        "makestep.h",
     ]
 }
diff --git a/src/plugins/bazaar/bazaar.qbs b/src/plugins/bazaar/bazaar.qbs
index 4271a0d0eba8761c98db518ef5c0222fdcebc187..d383da7cee5d58e4bac8f1a70f3e558c665c6155 100644
--- a/src/plugins/bazaar/bazaar.qbs
+++ b/src/plugins/bazaar/bazaar.qbs
@@ -20,42 +20,42 @@ QtcPlugin {
     ]
 
     files: [
-        "bazaar.qrc",
-        "bazaarcommitpanel.ui",
-        "cloneoptionspanel.ui",
-        "pullorpushdialog.ui",
-        "revertdialog.ui",
-        "bazaarcommitwidget.cpp",
-        "bazaarcommitwidget.h",
-        "bazaarsettings.cpp",
-        "branchinfo.cpp",
-        "branchinfo.h",
-        "cloneoptionspanel.cpp",
-        "cloneoptionspanel.h",
-        "constants.h",
-        "optionspage.ui",
-        "pullorpushdialog.cpp",
-        "pullorpushdialog.h",
         "annotationhighlighter.cpp",
         "annotationhighlighter.h",
+        "bazaar.qrc",
         "bazaarclient.cpp",
         "bazaarclient.h",
+        "bazaarcommitpanel.ui",
+        "bazaarcommitwidget.cpp",
+        "bazaarcommitwidget.h",
         "bazaarcontrol.cpp",
         "bazaarcontrol.h",
         "bazaareditor.cpp",
         "bazaareditor.h",
         "bazaarplugin.cpp",
         "bazaarplugin.h",
+        "bazaarsettings.cpp",
         "bazaarsettings.h",
+        "branchinfo.cpp",
+        "branchinfo.h",
+        "cloneoptionspanel.cpp",
+        "cloneoptionspanel.h",
+        "cloneoptionspanel.ui",
         "clonewizard.cpp",
         "clonewizard.h",
         "clonewizardpage.cpp",
         "clonewizardpage.h",
         "commiteditor.cpp",
         "commiteditor.h",
+        "constants.h",
         "optionspage.cpp",
         "optionspage.h",
-        "images/bazaar.png"
+        "optionspage.ui",
+        "pullorpushdialog.cpp",
+        "pullorpushdialog.h",
+        "pullorpushdialog.ui",
+        "revertdialog.ui",
+        "images/bazaar.png",
     ]
 }
 
diff --git a/src/plugins/bineditor/bineditor.qbs b/src/plugins/bineditor/bineditor.qbs
index b2fd675be869cd43a6890754e588685a73df50b5..ad7aaf9c3a6584642ba40e552c2c110d8df78bfe 100644
--- a/src/plugins/bineditor/bineditor.qbs
+++ b/src/plugins/bineditor/bineditor.qbs
@@ -18,12 +18,12 @@ QtcPlugin {
     ]
 
     files: [
-        "bineditorplugin.h",
+        "bineditor.cpp",
         "bineditor.h",
         "bineditorconstants.h",
-        "markup.h",
         "bineditorplugin.cpp",
-        "bineditor.cpp"
+        "bineditorplugin.h",
+        "markup.h",
     ]
 }
 
diff --git a/src/plugins/bookmarks/bookmarks.qbs b/src/plugins/bookmarks/bookmarks.qbs
index 0fa44b7194427c6b01bc846af7c2280b0972a92c..d1c0863f88580f347084eec551b38aa96426cb27 100644
--- a/src/plugins/bookmarks/bookmarks.qbs
+++ b/src/plugins/bookmarks/bookmarks.qbs
@@ -20,14 +20,14 @@ QtcPlugin {
     ]
 
     files: [
-        "bookmarksplugin.h",
+        "bookmark.cpp",
         "bookmark.h",
+        "bookmarkmanager.cpp",
         "bookmarkmanager.h",
+        "bookmarks.qrc",
         "bookmarks_global.h",
         "bookmarksplugin.cpp",
-        "bookmark.cpp",
-        "bookmarkmanager.cpp",
-        "bookmarks.qrc",
+        "bookmarksplugin.h",
     ]
 }
 
diff --git a/src/plugins/classview/classview.qbs b/src/plugins/classview/classview.qbs
index a7ad4a23c2371d4bfc9978f81570a208f9e93813..65052fb16c55faf09e291f0bd13ebc8af69b383b 100644
--- a/src/plugins/classview/classview.qbs
+++ b/src/plugins/classview/classview.qbs
@@ -20,29 +20,29 @@ QtcPlugin {
     ]
 
     files: [
-        "classviewplugin.h",
-        "classviewnavigationwidgetfactory.h",
+        "classview.qrc",
         "classviewconstants.h",
+        "classviewmanager.cpp",
+        "classviewmanager.h",
+        "classviewnavigationwidget.cpp",
         "classviewnavigationwidget.h",
+        "classviewnavigationwidget.ui",
+        "classviewnavigationwidgetfactory.cpp",
+        "classviewnavigationwidgetfactory.h",
+        "classviewparser.cpp",
         "classviewparser.h",
-        "classviewmanager.h",
-        "classviewsymbollocation.h",
-        "classviewsymbolinformation.h",
+        "classviewparsertreeitem.cpp",
         "classviewparsertreeitem.h",
-        "classviewutils.h",
-        "classviewtreeitemmodel.h",
         "classviewplugin.cpp",
-        "classviewnavigationwidgetfactory.cpp",
-        "classviewnavigationwidget.cpp",
-        "classviewparser.cpp",
-        "classviewmanager.cpp",
-        "classviewsymbollocation.cpp",
+        "classviewplugin.h",
         "classviewsymbolinformation.cpp",
-        "classviewparsertreeitem.cpp",
-        "classviewutils.cpp",
+        "classviewsymbolinformation.h",
+        "classviewsymbollocation.cpp",
+        "classviewsymbollocation.h",
         "classviewtreeitemmodel.cpp",
-        "classviewnavigationwidget.ui",
-        "classview.qrc",
+        "classviewtreeitemmodel.h",
+        "classviewutils.cpp",
+        "classviewutils.h",
     ]
 }
 
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs
index 541176d66a36f8b6fc6bf61fd5af7244eee063c8..4a55c77dbe29852fc838b04d165329be7a7e8d4b 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs
@@ -51,7 +51,7 @@ QtcPlugin {
         "cmakeuicodemodelsupport.cpp",
         "cmakeuicodemodelsupport.h",
         "makestep.cpp",
-        "makestep.h"
+        "makestep.h",
     ]
 }
 
diff --git a/src/plugins/coreplugin/coreplugin.qbs b/src/plugins/coreplugin/coreplugin.qbs
index 3e08d3d70ecb3a10655be8f536e9e81494da206e..614f35e23c691a4fdeba62aea62d032fe8079174 100644
--- a/src/plugins/coreplugin/coreplugin.qbs
+++ b/src/plugins/coreplugin/coreplugin.qbs
@@ -36,8 +36,6 @@ QtcPlugin {
     }
 
     files: [
-        "fancyactionbar.qrc",
-        "generalsettings.ui",
         "basefilewizard.cpp",
         "basefilewizard.h",
         "core.qrc",
@@ -47,6 +45,8 @@ QtcPlugin {
         "coreplugin.h",
         "designmode.cpp",
         "designmode.h",
+        "documentmanager.cpp",
+        "documentmanager.h",
         "editmode.cpp",
         "editmode.h",
         "editortoolbar.cpp",
@@ -56,10 +56,11 @@ QtcPlugin {
         "externaltoolmanager.h",
         "fancyactionbar.cpp",
         "fancyactionbar.h",
+        "fancyactionbar.qrc",
         "fancytabwidget.cpp",
         "fancytabwidget.h",
-        "featureprovider.h",
         "featureprovider.cpp",
+        "featureprovider.h",
         "fileiconprovider.cpp",
         "fileiconprovider.h",
         "fileutils.cpp",
@@ -68,6 +69,7 @@ QtcPlugin {
         "findplaceholder.h",
         "generalsettings.cpp",
         "generalsettings.h",
+        "generalsettings.ui",
         "generatedfile.cpp",
         "generatedfile.h",
         "helpmanager.cpp",
@@ -77,20 +79,21 @@ QtcPlugin {
         "icore.cpp",
         "icore.h",
         "icorelistener.h",
+        "id.cpp",
         "id.h",
-        "ifilewizardextension.h",
-        "imode.cpp",
-        "imode.h",
-        "documentmanager.cpp",
-        "documentmanager.h",
         "idocument.cpp",
         "idocument.h",
         "idocumentfactory.h",
+        "ifilewizardextension.h",
+        "imode.cpp",
+        "imode.h",
         "inavigationwidgetfactory.cpp",
         "inavigationwidgetfactory.h",
         "infobar.cpp",
         "infobar.h",
         "ioutputpane.h",
+        "iversioncontrol.cpp",
+        "iversioncontrol.h",
         "mainwindow.cpp",
         "mainwindow.h",
         "manhattanstyle.cpp",
@@ -146,18 +149,15 @@ QtcPlugin {
         "textdocument.h",
         "toolsettings.cpp",
         "toolsettings.h",
+        "variablechooser.cpp",
         "variablechooser.h",
         "variablechooser.ui",
-        "vcsmanager.h",
-        "versiondialog.cpp",
-        "versiondialog.h",
-        "id.cpp",
-        "iversioncontrol.cpp",
-        "iversioncontrol.h",
-        "variablechooser.cpp",
         "variablemanager.cpp",
         "variablemanager.h",
         "vcsmanager.cpp",
+        "vcsmanager.h",
+        "versiondialog.cpp",
+        "versiondialog.h",
         "actionmanager/actioncontainer.cpp",
         "actionmanager/actioncontainer.h",
         "actionmanager/actioncontainer_p.h",
@@ -167,23 +167,23 @@ QtcPlugin {
         "actionmanager/command.cpp",
         "actionmanager/command.h",
         "actionmanager/command_p.h",
-        "actionmanager/commandbutton.h",
         "actionmanager/commandbutton.cpp",
+        "actionmanager/commandbutton.h",
         "actionmanager/commandmappings.cpp",
         "actionmanager/commandmappings.h",
         "actionmanager/commandmappings.ui",
         "actionmanager/commandsfile.cpp",
         "actionmanager/commandsfile.h",
-        "dialogs/externaltoolconfig.ui",
-        "dialogs/newdialog.ui",
         "dialogs/externaltoolconfig.cpp",
         "dialogs/externaltoolconfig.h",
+        "dialogs/externaltoolconfig.ui",
         "dialogs/ioptionspage.cpp",
         "dialogs/ioptionspage.h",
         "dialogs/iwizard.cpp",
         "dialogs/iwizard.h",
         "dialogs/newdialog.cpp",
         "dialogs/newdialog.h",
+        "dialogs/newdialog.ui",
         "dialogs/openwithdialog.cpp",
         "dialogs/openwithdialog.h",
         "dialogs/openwithdialog.ui",
@@ -197,12 +197,14 @@ QtcPlugin {
         "dialogs/shortcutsettings.cpp",
         "dialogs/shortcutsettings.h",
         "editormanager/BinFiles.mimetypes.xml",
+        "editormanager/editormanager.cpp",
+        "editormanager/editormanager.h",
         "editormanager/editorview.cpp",
         "editormanager/editorview.h",
         "editormanager/ieditor.cpp",
         "editormanager/ieditor.h",
-        "editormanager/ieditorfactory.h",
         "editormanager/ieditorfactory.cpp",
+        "editormanager/ieditorfactory.h",
         "editormanager/iexternaleditor.cpp",
         "editormanager/iexternaleditor.h",
         "editormanager/openeditorsmodel.cpp",
@@ -214,8 +216,6 @@ QtcPlugin {
         "editormanager/openeditorswindow.h",
         "editormanager/systemeditor.cpp",
         "editormanager/systemeditor.h",
-        "editormanager/editormanager.cpp",
-        "editormanager/editormanager.h",
         "progressmanager/futureprogress.cpp",
         "progressmanager/futureprogress.h",
         "progressmanager/progressbar.cpp",
@@ -228,27 +228,27 @@ QtcPlugin {
         "scriptmanager/metatypedeclarations.h",
         "scriptmanager/scriptmanager.cpp",
         "scriptmanager/scriptmanager.h",
-        "scriptmanager/scriptmanager_p.h"
+        "scriptmanager/scriptmanager_p.h",
     ]
 
     Group {
         condition: qbs.targetOS == "windows"
         files: [
-            "progressmanager/progressmanager_win.cpp"
+            "progressmanager/progressmanager_win.cpp",
         ]
     }
 
     Group {
         condition: qbs.targetOS == "macx"
         files: [
-            "progressmanager/progressmanager_mac.mm"
+            "progressmanager/progressmanager_mac.mm",
         ]
     }
 
     Group {
         condition: qbs.targetOS == "linux"
         files: [
-            "progressmanager/progressmanager_x11.cpp"
+            "progressmanager/progressmanager_x11.cpp",
         ]
     }
 
diff --git a/src/plugins/cpaster/cpaster.qbs b/src/plugins/cpaster/cpaster.qbs
index 30208fe477387d42ebfdfc584ed1db5c18c3607f..a906d6cceaaa9e5f48dd563ea0744b318697f4d3 100644
--- a/src/plugins/cpaster/cpaster.qbs
+++ b/src/plugins/cpaster/cpaster.qbs
@@ -54,7 +54,7 @@ QtcPlugin {
         "settingspage.h",
         "settingspage.ui",
         "urlopenprotocol.cpp",
-        "urlopenprotocol.h"
+        "urlopenprotocol.h",
     ]
 
     Group {
@@ -63,7 +63,7 @@ QtcPlugin {
             "cgi.cpp",
             "cgi.h",
             "splitter.cpp",
-            "splitter.h"
+            "splitter.h",
         ]
     }
 }
diff --git a/src/plugins/cpaster/frontend/frontend.qbs b/src/plugins/cpaster/frontend/frontend.qbs
index 37c7d94ac09c932725872312bddbe83453a41d1b..4c7b25f3ab48de18c10b33912bf8ccfc62e585a9 100644
--- a/src/plugins/cpaster/frontend/frontend.qbs
+++ b/src/plugins/cpaster/frontend/frontend.qbs
@@ -21,10 +21,10 @@ QtcTool {
     files: [ "main.cpp",
         "argumentscollector.h", "argumentscollector.cpp",
         "../cpasterconstants.h",
-        "../protocol.h", "../protocol.cpp",
-        "../pastebindotcomprotocol.h", "../pastebindotcomprotocol.cpp",
-        "../pastebindotcaprotocol.h", "../pastebindotcaprotocol.cpp",
         "../kdepasteprotocol.h", "../kdepasteprotocol.cpp",
-        "../urlopenprotocol.h", "../urlopenprotocol.cpp"
+        "../pastebindotcaprotocol.h", "../pastebindotcaprotocol.cpp",
+        "../pastebindotcomprotocol.h", "../pastebindotcomprotocol.cpp",
+        "../protocol.h", "../protocol.cpp",
+        "../urlopenprotocol.h", "../urlopenprotocol.cpp",
     ]
 }
diff --git a/src/plugins/cppeditor/cppeditor.qbs b/src/plugins/cppeditor/cppeditor.qbs
index 8b9295c940a82c673dabb1a6bc59133171fffe0d..9c86f15f35231de1af2c02c812268b4da73997fa 100644
--- a/src/plugins/cppeditor/cppeditor.qbs
+++ b/src/plugins/cppeditor/cppeditor.qbs
@@ -21,7 +21,6 @@ QtcPlugin {
 
     files: [
         "CppEditor.mimetypes.xml",
-        "cppeditor.qrc",
         "cppautocompleter.cpp",
         "cppautocompleter.h",
         "cppclasswizard.cpp",
@@ -30,6 +29,7 @@ QtcPlugin {
         "cppcompleteswitch.h",
         "cppeditor.cpp",
         "cppeditor.h",
+        "cppeditor.qrc",
         "cppeditor_global.h",
         "cppeditorconstants.h",
         "cppeditorenums.h",
@@ -59,7 +59,7 @@ QtcPlugin {
         "cppsnippetprovider.cpp",
         "cppsnippetprovider.h",
         "cpptypehierarchy.cpp",
-        "cpptypehierarchy.h"
+        "cpptypehierarchy.h",
     ]
 }
 
diff --git a/src/plugins/cpptools/cpptools.qbs b/src/plugins/cpptools/cpptools.qbs
index 66cbccf0aed52ff519b115e03ed7d44a3c2ffe5c..5de56fa4443e3f2e63462a94e19eb74b6cd75345 100644
--- a/src/plugins/cpptools/cpptools.qbs
+++ b/src/plugins/cpptools/cpptools.qbs
@@ -25,6 +25,10 @@ QtcPlugin {
     ]
 
     files: [
+        "ModelManagerInterface.cpp",
+        "ModelManagerInterface.h",
+        "TypeHierarchyBuilder.cpp",
+        "TypeHierarchyBuilder.h",
         "abstracteditorsupport.cpp",
         "abstracteditorsupport.h",
         "commentssettings.cpp",
@@ -32,6 +36,8 @@ QtcPlugin {
         "completionsettingspage.cpp",
         "completionsettingspage.h",
         "completionsettingspage.ui",
+        "cppchecksymbols.cpp",
+        "cppchecksymbols.h",
         "cppclassesfilter.cpp",
         "cppclassesfilter.h",
         "cppcodeformatter.cpp",
@@ -39,6 +45,7 @@ QtcPlugin {
         "cppcodestylepreferences.cpp",
         "cppcodestylepreferences.h",
         "cppcodestylepreferencesfactory.cpp",
+        "cppcodestylepreferencesfactory.h",
         "cppcodestylesettings.cpp",
         "cppcodestylesettings.h",
         "cppcodestylesettingspage.cpp",
@@ -46,12 +53,14 @@ QtcPlugin {
         "cppcodestylesettingspage.ui",
         "cppcompletionassist.cpp",
         "cppcompletionassist.h",
+        "cppcompletionassistprovider.cpp",
+        "cppcompletionassistprovider.h",
+        "cppcompletionsupport.cpp",
+        "cppcompletionsupport.h",
         "cppcurrentdocumentfilter.cpp",
         "cppcurrentdocumentfilter.h",
         "cppdoxygen.cpp",
         "cppdoxygen.h",
-        "cppcompletionsupport.cpp",
-        "cppcompletionsupport.h",
         "cppfilesettingspage.cpp",
         "cppfilesettingspage.h",
         "cppfilesettingspage.ui",
@@ -59,10 +68,12 @@ QtcPlugin {
         "cppfindreferences.h",
         "cppfunctionsfilter.cpp",
         "cppfunctionsfilter.h",
-        "cpphighlightingsupportinternal.cpp",
-        "cpphighlightingsupportinternal.h",
         "cpphighlightingsupport.cpp",
         "cpphighlightingsupport.h",
+        "cpphighlightingsupportinternal.cpp",
+        "cpphighlightingsupportinternal.h",
+        "cpplocalsymbols.cpp",
+        "cpplocalsymbols.h",
         "cpplocatorfilter.cpp",
         "cpplocatorfilter.h",
         "cppmodelmanager.cpp",
@@ -73,10 +84,6 @@ QtcPlugin {
         "cpprefactoringchanges.h",
         "cppsemanticinfo.cpp",
         "cppsemanticinfo.h",
-        "cppchecksymbols.cpp",
-        "cppchecksymbols.h",
-        "cpplocalsymbols.cpp",
-        "cpplocalsymbols.h",
         "cpptools_global.h",
         "cpptoolsconstants.h",
         "cpptoolseditorsupport.cpp",
@@ -99,13 +106,6 @@ QtcPlugin {
         "symbolsfindfilter.h",
         "uicodecompletionsupport.cpp",
         "uicodecompletionsupport.h",
-        "cppcompletionassistprovider.cpp",
-        "cppcompletionassistprovider.h",
-        "cppcodestylepreferencesfactory.h",
-        "ModelManagerInterface.cpp",
-        "ModelManagerInterface.h",
-        "TypeHierarchyBuilder.cpp",
-        "TypeHierarchyBuilder.h"
     ]
 
     Group {
diff --git a/src/plugins/cvs/cvs.qbs b/src/plugins/cvs/cvs.qbs
index f45ca0a576da58e0635d34bfbdbd5313d062174f..1067321d7f20f35f4fd38caa70971a2554ba74db 100644
--- a/src/plugins/cvs/cvs.qbs
+++ b/src/plugins/cvs/cvs.qbs
@@ -20,28 +20,28 @@ QtcPlugin {
     ]
 
     files: [
+        "annotationhighlighter.cpp",
         "annotationhighlighter.h",
-        "cvsplugin.h",
-        "cvscontrol.h",
-        "settingspage.h",
-        "cvseditor.h",
-        "cvssubmiteditor.h",
-        "cvssettings.h",
-        "cvsutils.h",
-        "cvsconstants.h",
+        "checkoutwizard.cpp",
         "checkoutwizard.h",
+        "checkoutwizardpage.cpp",
         "checkoutwizardpage.h",
-        "annotationhighlighter.cpp",
-        "cvsplugin.cpp",
+        "cvs.qrc",
+        "cvsconstants.h",
         "cvscontrol.cpp",
-        "settingspage.cpp",
+        "cvscontrol.h",
         "cvseditor.cpp",
-        "cvssubmiteditor.cpp",
+        "cvseditor.h",
+        "cvsplugin.cpp",
+        "cvsplugin.h",
         "cvssettings.cpp",
+        "cvssettings.h",
+        "cvssubmiteditor.cpp",
+        "cvssubmiteditor.h",
         "cvsutils.cpp",
-        "checkoutwizard.cpp",
-        "checkoutwizardpage.cpp",
+        "cvsutils.h",
+        "settingspage.cpp",
+        "settingspage.h",
         "settingspage.ui",
-        "cvs.qrc"
     ]
 }
diff --git a/src/plugins/debugger/debugger.qbs b/src/plugins/debugger/debugger.qbs
index 0b227b2cb24ad27a0b2cd96e8bece9daad6e684d..74236e39481b560842f6aa1614803f458e5ba536 100644
--- a/src/plugins/debugger/debugger.qbs
+++ b/src/plugins/debugger/debugger.qbs
@@ -40,12 +40,8 @@ QtcPlugin {
     }
 
     files: [
-        "debugger.qrc",
-        "debuggerkitconfigwidget.cpp",
-        "debuggerkitconfigwidget.h",
-        "debuggerkitinformation.cpp",
-        "debuggerkitinformation.h",
         "basewindow.cpp",
+        "basewindow.h",
         "breakhandler.cpp",
         "breakhandler.h",
         "breakpoint.cpp",
@@ -57,16 +53,27 @@ QtcPlugin {
         "commonoptionspage.cpp",
         "commonoptionspage.h",
         "commonoptionspage.ui",
+        "debugger.qrc",
         "debugger_global.h",
+        "debuggeractions.cpp",
+        "debuggeractions.h",
+        "debuggerconstants.h",
         "debuggercore.h",
         "debuggerdialogs.cpp",
         "debuggerdialogs.h",
         "debuggerengine.cpp",
         "debuggerengine.h",
         "debuggerinternalconstants.h",
+        "debuggerkitconfigwidget.cpp",
+        "debuggerkitconfigwidget.h",
+        "debuggerkitinformation.cpp",
+        "debuggerkitinformation.h",
         "debuggermainwindow.cpp",
         "debuggermainwindow.h",
+        "debuggerplugin.cpp",
         "debuggerplugin.h",
+        "debuggerruncontrolfactory.h",
+        "debuggerrunner.cpp",
         "debuggerrunner.h",
         "debuggersourcepathmappingwidget.cpp",
         "debuggersourcepathmappingwidget.h",
@@ -99,18 +106,18 @@ QtcPlugin {
         "outputcollector.h",
         "procinterrupt.cpp",
         "procinterrupt.h",
-        "qtmessagelogwindow.h",
+        "qtmessagelogeditor.cpp",
         "qtmessagelogeditor.h",
-        "qtmessagelogview.h",
-        "qtmessagelogproxymodel.h",
-        "qtmessagelogitemdelegate.h",
+        "qtmessageloghandler.cpp",
         "qtmessageloghandler.h",
-        "qtmessagelogwindow.cpp",
+        "qtmessagelogitemdelegate.cpp",
+        "qtmessagelogitemdelegate.h",
         "qtmessagelogproxymodel.cpp",
+        "qtmessagelogproxymodel.h",
         "qtmessagelogview.cpp",
-        "qtmessagelogitemdelegate.cpp",
-        "qtmessageloghandler.cpp",
-        "qtmessagelogeditor.cpp",
+        "qtmessagelogview.h",
+        "qtmessagelogwindow.cpp",
+        "qtmessagelogwindow.h",
         "registerhandler.cpp",
         "registerhandler.h",
         "registerwindow.cpp",
@@ -146,13 +153,6 @@ QtcPlugin {
         "watchutils.h",
         "watchwindow.cpp",
         "watchwindow.h",
-        "basewindow.h",
-        "debuggeractions.cpp",
-        "debuggeractions.h",
-        "debuggerconstants.h",
-        "debuggerplugin.cpp",
-        "debuggerruncontrolfactory.h",
-        "debuggerrunner.cpp",
         "cdb/bytearrayinputstream.cpp",
         "cdb/bytearrayinputstream.h",
         "cdb/cdbengine.cpp",
@@ -164,17 +164,21 @@ QtcPlugin {
         "cdb/cdboptionspagewidget.ui",
         "cdb/cdbparsehelpers.cpp",
         "cdb/cdbparsehelpers.h",
-        "gdb/gdb.qrc",
         "gdb/abstractgdbprocess.cpp",
         "gdb/abstractgdbprocess.h",
         "gdb/abstractplaingdbadapter.cpp",
         "gdb/abstractplaingdbadapter.h",
+        "gdb/attachgdbadapter.cpp",
         "gdb/attachgdbadapter.h",
+        "gdb/classicgdbengine.cpp",
         "gdb/coregdbadapter.cpp",
         "gdb/coregdbadapter.h",
+        "gdb/gdb.qrc",
         "gdb/gdbengine.cpp",
+        "gdb/gdbengine.h",
         "gdb/gdbmi.cpp",
         "gdb/gdbmi.h",
+        "gdb/gdboptionspage.cpp",
         "gdb/gdboptionspage.h",
         "gdb/localgdbprocess.cpp",
         "gdb/localgdbprocess.h",
@@ -187,14 +191,10 @@ QtcPlugin {
         "gdb/remotegdbserveradapter.h",
         "gdb/remoteplaingdbadapter.cpp",
         "gdb/remoteplaingdbadapter.h",
-        "gdb/termgdbadapter.h",
-        "gdb/attachgdbadapter.cpp",
-        "gdb/classicgdbengine.cpp",
-        "gdb/gdbengine.h",
-        "gdb/gdboptionspage.cpp",
-        "gdb/termgdbadapter.cpp",
         "gdb/startgdbserverdialog.cpp",
         "gdb/startgdbserverdialog.h",
+        "gdb/termgdbadapter.cpp",
+        "gdb/termgdbadapter.h",
         "images/breakpoint_16.png",
         "images/breakpoint_24.png",
         "images/breakpoint_disabled_16.png",
@@ -227,29 +227,40 @@ QtcPlugin {
         "images/location_24.png",
         "images/tracepoint.png",
         "images/watchpoint.png",
+        "lldb/ipcenginehost.cpp",
+        "lldb/ipcenginehost.h",
+        "lldb/lldbenginehost.cpp",
+        "lldb/lldbenginehost.h",
+        "namedemangler/demanglerexceptions.h",
+        "namedemangler/globalparsestate.cpp",
+        "namedemangler/globalparsestate.h",
+        "namedemangler/namedemangler.cpp",
+        "namedemangler/namedemangler.h",
+        "namedemangler/parsetreenodes.cpp",
+        "namedemangler/parsetreenodes.h",
         "pdb/pdbengine.cpp",
         "pdb/pdbengine.h",
-        "qml/qmlengine.h",
-        "qml/qmladapter.h",
+        "qml/baseqmldebuggerclient.cpp",
         "qml/baseqmldebuggerclient.h",
-        "qml/qmlcppengine.h",
-        "qml/qscriptdebuggerclient.h",
-        "qml/qmlv8debuggerclient.h",
+        "qml/interactiveinterpreter.cpp",
         "qml/interactiveinterpreter.h",
-        "qml/qmlv8debuggerclientconstants.h",
-        "qml/qmlengine.cpp",
         "qml/qmladapter.cpp",
-        "qml/baseqmldebuggerclient.cpp",
+        "qml/qmladapter.h",
         "qml/qmlcppengine.cpp",
-        "qml/qscriptdebuggerclient.cpp",
-        "qml/qmlv8debuggerclient.cpp",
-        "qml/interactiveinterpreter.cpp",
+        "qml/qmlcppengine.h",
+        "qml/qmlengine.cpp",
+        "qml/qmlengine.h",
         "qml/qmlinspectoradapter.cpp",
         "qml/qmlinspectoradapter.h",
         "qml/qmlinspectoragent.cpp",
         "qml/qmlinspectoragent.h",
         "qml/qmllivetextpreview.cpp",
         "qml/qmllivetextpreview.h",
+        "qml/qmlv8debuggerclient.cpp",
+        "qml/qmlv8debuggerclient.h",
+        "qml/qmlv8debuggerclientconstants.h",
+        "qml/qscriptdebuggerclient.cpp",
+        "qml/qscriptdebuggerclient.h",
         "script/scriptengine.cpp",
         "script/scriptengine.h",
         "shared/backtrace.cpp",
@@ -258,17 +269,6 @@ QtcPlugin {
         "shared/cdbsymbolpathlisteditor.h",
         "shared/hostutils.cpp",
         "shared/hostutils.h",
-        "lldb/ipcenginehost.cpp",
-        "lldb/ipcenginehost.h",
-        "lldb/lldbenginehost.cpp",
-        "lldb/lldbenginehost.h",
-        "namedemangler/namedemangler.cpp",
-        "namedemangler/namedemangler.h",
-        "namedemangler/parsetreenodes.cpp",
-        "namedemangler/parsetreenodes.h",
-        "namedemangler/demanglerexceptions.h",
-        "namedemangler/globalparsestate.h",
-        "namedemangler/globalparsestate.cpp"
     ]
 
     Group {
@@ -276,7 +276,7 @@ QtcPlugin {
         prefix: "../../shared/registryaccess/"
         files: [
             "registryaccess.cpp",
-            "registryaccess.h"
+            "registryaccess.h",
         ]
     }
 
@@ -286,7 +286,7 @@ QtcPlugin {
             "registerpostmortemaction.cpp",
             "registerpostmortemaction.h",
             "shared/peutils.cpp",
-            "shared/peutils.h"
+            "shared/peutils.h",
         ]
     }
 
@@ -295,7 +295,7 @@ QtcPlugin {
         files: [
             "lldb/lldboptionspage.cpp",
             "lldb/lldboptionspage.h",
-            "lldb/lldboptionspagewidget.ui"
+            "lldb/lldboptionspagewidget.ui",
         ]
     }
 
diff --git a/src/plugins/designer/designer.qbs b/src/plugins/designer/designer.qbs
index 19769a0ad72c08a833ff3ef9de2ed419f95e62f2..8c793f586f78c5e59f630cf8ecf29c4d1d30bc3f 100644
--- a/src/plugins/designer/designer.qbs
+++ b/src/plugins/designer/designer.qbs
@@ -25,67 +25,67 @@ QtcPlugin {
     ]
 
     files: [
-        "../../shared/designerintegrationv2/widgethost.h",
-        "../../shared/designerintegrationv2/sizehandlerect.h",
-        "../../shared/designerintegrationv2/formresizer.h",
-        "../../shared/designerintegrationv2/widgethostconstants.h",
-        "cpp/formclasswizardpage.h",
-        "cpp/formclasswizarddialog.h",
-        "cpp/formclasswizard.h",
-        "cpp/formclasswizardparameters.h",
-        "cpp/cppsettingspage.h",
-        "formeditorplugin.h",
-        "formeditorfactory.h",
-        "formwindoweditor.h",
-        "formwindowfile.h",
-        "formwizard.h",
-        "qtcreatorintegration.h",
-        "designerconstants.h",
-        "settingspage.h",
-        "editorwidget.h",
-        "formeditorw.h",
-        "settingsmanager.h",
-        "formtemplatewizardpage.h",
-        "formwizarddialog.h",
+        "Designer.mimetypes.xml",
+        "README.txt",
+        "codemodelhelpers.cpp",
         "codemodelhelpers.h",
+        "designer.qrc",
         "designer_export.h",
-        "designerxmleditor.h",
+        "designerconstants.h",
+        "designercontext.cpp",
         "designercontext.h",
-        "formeditorstack.h",
+        "designerxmleditor.cpp",
+        "designerxmleditor.h",
         "editordata.h",
-        "resourcehandler.h",
-        "qtdesignerformclasscodegenerator.h",
-        "../../shared/designerintegrationv2/widgethost.cpp",
-        "../../shared/designerintegrationv2/sizehandlerect.cpp",
-        "../../shared/designerintegrationv2/formresizer.cpp",
-        "cpp/formclasswizardpage.cpp",
-        "cpp/formclasswizarddialog.cpp",
-        "cpp/formclasswizard.cpp",
-        "cpp/formclasswizardparameters.cpp",
-        "cpp/cppsettingspage.cpp",
-        "formeditorplugin.cpp",
+        "editorwidget.cpp",
+        "editorwidget.h",
         "formeditorfactory.cpp",
+        "formeditorfactory.h",
+        "formeditorplugin.cpp",
+        "formeditorplugin.h",
+        "formeditorstack.cpp",
+        "formeditorstack.h",
+        "formeditorw.cpp",
+        "formeditorw.h",
+        "formtemplatewizardpage.cpp",
+        "formtemplatewizardpage.h",
         "formwindoweditor.cpp",
+        "formwindoweditor.h",
         "formwindowfile.cpp",
+        "formwindowfile.h",
         "formwizard.cpp",
-        "qtcreatorintegration.cpp",
-        "settingspage.cpp",
-        "editorwidget.cpp",
-        "formeditorw.cpp",
-        "settingsmanager.cpp",
-        "formtemplatewizardpage.cpp",
+        "formwizard.h",
         "formwizarddialog.cpp",
-        "codemodelhelpers.cpp",
-        "designerxmleditor.cpp",
-        "designercontext.cpp",
-        "formeditorstack.cpp",
-        "resourcehandler.cpp",
+        "formwizarddialog.h",
+        "qtcreatorintegration.cpp",
+        "qtcreatorintegration.h",
         "qtdesignerformclasscodegenerator.cpp",
-        "cpp/formclasswizardpage.ui",
+        "qtdesignerformclasscodegenerator.h",
+        "resourcehandler.cpp",
+        "resourcehandler.h",
+        "settingsmanager.cpp",
+        "settingsmanager.h",
+        "settingspage.cpp",
+        "settingspage.h",
+        "../../shared/designerintegrationv2/formresizer.cpp",
+        "../../shared/designerintegrationv2/formresizer.h",
+        "../../shared/designerintegrationv2/sizehandlerect.cpp",
+        "../../shared/designerintegrationv2/sizehandlerect.h",
+        "../../shared/designerintegrationv2/widgethost.cpp",
+        "../../shared/designerintegrationv2/widgethost.h",
+        "../../shared/designerintegrationv2/widgethostconstants.h",
+        "cpp/cppsettingspage.cpp",
+        "cpp/cppsettingspage.h",
         "cpp/cppsettingspagewidget.ui",
-        "designer.qrc",
-        "Designer.mimetypes.xml",
-        "README.txt"
+        "cpp/formclasswizard.cpp",
+        "cpp/formclasswizard.h",
+        "cpp/formclasswizarddialog.cpp",
+        "cpp/formclasswizarddialog.h",
+        "cpp/formclasswizardpage.cpp",
+        "cpp/formclasswizardpage.h",
+        "cpp/formclasswizardpage.ui",
+        "cpp/formclasswizardparameters.cpp",
+        "cpp/formclasswizardparameters.h",
     ]
 }
 
diff --git a/src/plugins/fakevim/fakevim.qbs b/src/plugins/fakevim/fakevim.qbs
index 788e53b00562c27d7f0f9fe74fcb49681d6f54bd..ed44480700c683c7b45f3707ea31d7d15aee6774 100644
--- a/src/plugins/fakevim/fakevim.qbs
+++ b/src/plugins/fakevim/fakevim.qbs
@@ -20,12 +20,12 @@ QtcPlugin {
 
     files: [
         "fakevimactions.cpp",
-        "fakevimhandler.cpp",
-        "fakevimplugin.cpp",
         "fakevimactions.h",
+        "fakevimhandler.cpp",
         "fakevimhandler.h",
+        "fakevimoptions.ui",
+        "fakevimplugin.cpp",
         "fakevimplugin.h",
-        "fakevimoptions.ui"
     ]
 
     Group {
diff --git a/src/plugins/find/find.qbs b/src/plugins/find/find.qbs
index 560bb28fda7a677d9b049cc5c1524cf8bbedc366..8cc6d8ecf0733dbf52a820185ed22b2c2f07902b 100644
--- a/src/plugins/find/find.qbs
+++ b/src/plugins/find/find.qbs
@@ -21,12 +21,11 @@ QtcPlugin {
     ]
 
     files: [
-        "find.qrc",
-        "findwidget.ui",
         "basetextfind.cpp",
         "basetextfind.h",
         "currentdocumentfind.cpp",
         "currentdocumentfind.h",
+        "find.qrc",
         "find_global.h",
         "finddialog.ui",
         "findplugin.cpp",
@@ -35,6 +34,7 @@ QtcPlugin {
         "findtoolbar.h",
         "findtoolwindow.cpp",
         "findtoolwindow.h",
+        "findwidget.ui",
         "ifindfilter.cpp",
         "ifindfilter.h",
         "ifindsupport.cpp",
@@ -54,7 +54,7 @@ QtcPlugin {
         "searchresultwindow.h",
         "textfindconstants.h",
         "treeviewfind.cpp",
-        "treeviewfind.h"
+        "treeviewfind.h",
     ]
 }
 
diff --git a/src/plugins/genericprojectmanager/genericprojectmanager.qbs b/src/plugins/genericprojectmanager/genericprojectmanager.qbs
index 9b47c6767be9de259aef6bdfdd473f26109c3e67..866e88c9cf7934932186446f1281cacce4cc0be7 100644
--- a/src/plugins/genericprojectmanager/genericprojectmanager.qbs
+++ b/src/plugins/genericprojectmanager/genericprojectmanager.qbs
@@ -23,31 +23,31 @@ QtcPlugin {
     ]
 
     files: [
+        "filesselectionwizardpage.cpp",
+        "filesselectionwizardpage.h",
+        "genericbuildconfiguration.cpp",
+        "genericbuildconfiguration.h",
+        "genericmakestep.cpp",
+        "genericmakestep.h",
+        "genericmakestep.ui",
+        "genericproject.cpp",
         "genericproject.h",
-        "genericprojectplugin.h",
-        "genericprojectmanager.h",
+        "genericproject.qrc",
         "genericprojectconstants.h",
-        "genericprojectnodes.h",
-        "genericprojectwizard.h",
+        "genericprojectfileseditor.cpp",
         "genericprojectfileseditor.h",
-        "pkgconfigtool.h",
-        "genericmakestep.h",
-        "genericbuildconfiguration.h",
-        "selectablefilesmodel.h",
-        "filesselectionwizardpage.h",
-        "genericproject.cpp",
-        "genericprojectplugin.cpp",
         "genericprojectmanager.cpp",
+        "genericprojectmanager.h",
         "genericprojectnodes.cpp",
+        "genericprojectnodes.h",
+        "genericprojectplugin.cpp",
+        "genericprojectplugin.h",
         "genericprojectwizard.cpp",
-        "genericprojectfileseditor.cpp",
+        "genericprojectwizard.h",
         "pkgconfigtool.cpp",
-        "genericmakestep.cpp",
-        "genericbuildconfiguration.cpp",
+        "pkgconfigtool.h",
         "selectablefilesmodel.cpp",
-        "filesselectionwizardpage.cpp",
-        "genericmakestep.ui",
-        "genericproject.qrc",
+        "selectablefilesmodel.h",
     ]
 }
 
diff --git a/src/plugins/git/git.qbs b/src/plugins/git/git.qbs
index 64ce4ff9052122d74ca96d1d9682f208da017be5..4e2e7fb3bbe02bb5ff95d5619fa980b714d9a063 100644
--- a/src/plugins/git/git.qbs
+++ b/src/plugins/git/git.qbs
@@ -24,18 +24,14 @@ QtcPlugin {
     ]
 
     files: [
-        "branchadddialog.ui",
-        "branchdialog.ui",
-        "git.qrc",
-        "gitsubmitpanel.ui",
-        "remoteadditiondialog.ui",
-        "stashdialog.ui",
         "annotationhighlighter.cpp",
         "annotationhighlighter.h",
         "branchadddialog.cpp",
         "branchadddialog.h",
+        "branchadddialog.ui",
         "branchdialog.cpp",
         "branchdialog.h",
+        "branchdialog.ui",
         "branchmodel.cpp",
         "branchmodel.h",
         "changeselectiondialog.cpp",
@@ -47,6 +43,7 @@ QtcPlugin {
         "clonewizardpage.h",
         "commitdata.cpp",
         "commitdata.h",
+        "git.qrc",
         "gitclient.cpp",
         "gitclient.h",
         "gitconstants.h",
@@ -60,10 +57,12 @@ QtcPlugin {
         "gitsubmiteditor.h",
         "gitsubmiteditorwidget.cpp",
         "gitsubmiteditorwidget.h",
+        "gitsubmitpanel.ui",
         "gitutils.cpp",
         "gitutils.h",
         "gitversioncontrol.cpp",
         "gitversioncontrol.h",
+        "remoteadditiondialog.ui",
         "remotedialog.cpp",
         "remotedialog.h",
         "remotedialog.ui",
@@ -75,29 +74,30 @@ QtcPlugin {
         "settingspage.h",
         "settingspage.ui",
         "stashdialog.cpp",
-        "stashdialog.h"
+        "stashdialog.h",
+        "stashdialog.ui",
     ]
 
     Group {
         prefix: "gitorious/"
         files: [
-            "gitorioushostwidget.ui",
-            "gitoriousprojectwidget.ui",
-            "gitoriousrepositorywizardpage.ui",
             "gitorious.cpp",
             "gitorious.h",
             "gitoriousclonewizard.cpp",
             "gitoriousclonewizard.h",
             "gitorioushostwidget.cpp",
             "gitorioushostwidget.h",
+            "gitorioushostwidget.ui",
             "gitorioushostwizardpage.cpp",
             "gitorioushostwizardpage.h",
             "gitoriousprojectwidget.cpp",
             "gitoriousprojectwidget.h",
+            "gitoriousprojectwidget.ui",
             "gitoriousprojectwizardpage.cpp",
             "gitoriousprojectwizardpage.h",
             "gitoriousrepositorywizardpage.cpp",
-            "gitoriousrepositorywizardpage.h"
+            "gitoriousrepositorywizardpage.h",
+            "gitoriousrepositorywizardpage.ui",
         ]
     }
 
@@ -113,7 +113,7 @@ QtcPlugin {
             "gerritparameters.cpp",
             "gerritparameters.h",
             "gerritplugin.cpp",
-            "gerritplugin.h"
+            "gerritplugin.h",
         ]
     }
 }
diff --git a/src/plugins/glsleditor/glsleditor.qbs b/src/plugins/glsleditor/glsleditor.qbs
index 3df8879e6f3db87b7ada9614f4858c45275ef5a8..732220ad840a59263c154823ffad5db6271600e8 100644
--- a/src/plugins/glsleditor/glsleditor.qbs
+++ b/src/plugins/glsleditor/glsleditor.qbs
@@ -22,34 +22,34 @@ QtcPlugin {
     ]
 
     files: [
+        "GLSLEditor.mimetypes.xml",
+        "glslautocompleter.cpp",
+        "glslautocompleter.h",
+        "glslcompletionassist.cpp",
+        "glslcompletionassist.h",
+        "glsleditor.cpp",
         "glsleditor.h",
+        "glsleditor.qrc",
         "glsleditor_global.h",
+        "glsleditoractionhandler.cpp",
         "glsleditoractionhandler.h",
         "glsleditorconstants.h",
+        "glsleditoreditable.cpp",
         "glsleditoreditable.h",
+        "glsleditorfactory.cpp",
         "glsleditorfactory.h",
+        "glsleditorplugin.cpp",
         "glsleditorplugin.h",
+        "glslfilewizard.cpp",
         "glslfilewizard.h",
+        "glslhighlighter.cpp",
         "glslhighlighter.h",
-        "glslautocompleter.h",
-        "glslindenter.h",
+        "glslhoverhandler.cpp",
         "glslhoverhandler.h",
-        "glslcompletionassist.h",
-        "reuse.h",
-        "glsleditor.cpp",
-        "glsleditoractionhandler.cpp",
-        "glsleditoreditable.cpp",
-        "glsleditorfactory.cpp",
-        "glsleditorplugin.cpp",
-        "glslfilewizard.cpp",
-        "glslhighlighter.cpp",
-        "glslautocompleter.cpp",
         "glslindenter.cpp",
-        "glslhoverhandler.cpp",
-        "glslcompletionassist.cpp",
+        "glslindenter.h",
         "reuse.cpp",
-        "glsleditor.qrc",
-        "GLSLEditor.mimetypes.xml"
+        "reuse.h",
     ]
 }
 
diff --git a/src/plugins/helloworld/helloworld.qbs b/src/plugins/helloworld/helloworld.qbs
index d71e157d85e2c46a2a3b82abd0b860c3de5c69c4..d1beb7d1a2169f30eefa5055b162707c9c0b3953 100644
--- a/src/plugins/helloworld/helloworld.qbs
+++ b/src/plugins/helloworld/helloworld.qbs
@@ -16,10 +16,10 @@ QtcPlugin {
     ]
 
     files: [
+        "helloworldplugin.cpp",
         "helloworldplugin.h",
+        "helloworldwindow.cpp",
         "helloworldwindow.h",
-        "helloworldplugin.cpp",
-        "helloworldwindow.cpp"
     ]
 }
 
diff --git a/src/plugins/help/help.qbs b/src/plugins/help/help.qbs
index 4deb59e091d4fb44f6d8859c1bae5fd66f3b006a..7af96d862e81b44004edacec5f977eb04138b693 100644
--- a/src/plugins/help/help.qbs
+++ b/src/plugins/help/help.qbs
@@ -35,65 +35,65 @@ QtcPlugin {
     ]
 
     files: [
+        "centralwidget.cpp",
         "centralwidget.h",
+        "docsettingspage.cpp",
         "docsettingspage.h",
+        "docsettingspage.ui",
+        "externalhelpwindow.cpp",
+        "externalhelpwindow.h",
+        "filtersettingspage.cpp",
         "filtersettingspage.h",
+        "filtersettingspage.ui",
+        "generalsettingspage.cpp",
         "generalsettingspage.h",
+        "generalsettingspage.ui",
+        "help.qrc",
         "help_global.h",
         "helpconstants.h",
+        "helpfindsupport.cpp",
         "helpfindsupport.h",
+        "helpindexfilter.cpp",
         "helpindexfilter.h",
-        "localhelpmanager.h",
+        "helpmode.cpp",
         "helpmode.h",
+        "helpplugin.cpp",
         "helpplugin.h",
+        "helpviewer.cpp",
         "helpviewer.h",
         "helpviewer_p.h",
-        "openpagesmanager.h",
-        "openpagesmodel.h",
-        "openpagesswitcher.h",
-        "openpageswidget.h",
-        "remotehelpfilter.h",
-        "searchwidget.h",
-        "xbelsupport.h",
-        "externalhelpwindow.h",
-        "centralwidget.cpp",
-        "docsettingspage.cpp",
-        "filtersettingspage.cpp",
-        "generalsettingspage.cpp",
-        "helpfindsupport.cpp",
-        "helpindexfilter.cpp",
-        "localhelpmanager.cpp",
-        "helpmode.cpp",
-        "helpplugin.cpp",
-        "helpviewer.cpp",
         "helpviewer_qtb.cpp",
         "helpviewer_qwv.cpp",
+        "localhelpmanager.cpp",
+        "localhelpmanager.h",
         "openpagesmanager.cpp",
+        "openpagesmanager.h",
         "openpagesmodel.cpp",
+        "openpagesmodel.h",
         "openpagesswitcher.cpp",
+        "openpagesswitcher.h",
         "openpageswidget.cpp",
+        "openpageswidget.h",
         "remotehelpfilter.cpp",
+        "remotehelpfilter.h",
+        "remotehelpfilter.ui",
         "searchwidget.cpp",
+        "searchwidget.h",
         "xbelsupport.cpp",
-        "externalhelpwindow.cpp",
-        "docsettingspage.ui",
-        "filtersettingspage.ui",
-        "generalsettingspage.ui",
-        "remotehelpfilter.ui",
-        "help.qrc",
-        "../../shared/help/bookmarkmanager.h",
-        "../../shared/help/contentwindow.h",
-        "../../shared/help/filternamedialog.h",
-        "../../shared/help/indexwindow.h",
-        "../../shared/help/topicchooser.h",
+        "xbelsupport.h",
+        "../../shared/help/bookmarkdialog.ui",
         "../../shared/help/bookmarkmanager.cpp",
+        "../../shared/help/bookmarkmanager.h",
         "../../shared/help/contentwindow.cpp",
+        "../../shared/help/contentwindow.h",
         "../../shared/help/filternamedialog.cpp",
+        "../../shared/help/filternamedialog.h",
+        "../../shared/help/filternamedialog.ui",
         "../../shared/help/indexwindow.cpp",
+        "../../shared/help/indexwindow.h",
         "../../shared/help/topicchooser.cpp",
-        "../../shared/help/bookmarkdialog.ui",
-        "../../shared/help/filternamedialog.ui",
-        "../../shared/help/topicchooser.ui"
+        "../../shared/help/topicchooser.h",
+        "../../shared/help/topicchooser.ui",
     ]
 }
 
diff --git a/src/plugins/imageviewer/imageviewer.qbs b/src/plugins/imageviewer/imageviewer.qbs
index d2257621cc98489487d7e3342cd0144c6c17fa47..6029976044bea337e6f7d009eb00bde8ecb66272 100644
--- a/src/plugins/imageviewer/imageviewer.qbs
+++ b/src/plugins/imageviewer/imageviewer.qbs
@@ -17,22 +17,22 @@ QtcPlugin {
     ]
 
     files: [
-        "imageviewerplugin.h",
-        "imageviewerfactory.h",
-        "imageviewerfile.h",
-        "imageviewer.h",
+        "ImageViewer.mimetypes.xml",
+        "imageview.cpp",
         "imageview.h",
-        "imageviewerconstants.h",
+        "imageviewer.cpp",
+        "imageviewer.h",
+        "imageviewer.qrc",
+        "imagevieweractionhandler.cpp",
         "imagevieweractionhandler.h",
-        "imageviewerplugin.cpp",
+        "imageviewerconstants.h",
         "imageviewerfactory.cpp",
+        "imageviewerfactory.h",
         "imageviewerfile.cpp",
-        "imageviewer.cpp",
-        "imageview.cpp",
-        "imagevieweractionhandler.cpp",
+        "imageviewerfile.h",
+        "imageviewerplugin.cpp",
+        "imageviewerplugin.h",
         "imageviewertoolbar.ui",
-        "imageviewer.qrc",
-        "ImageViewer.mimetypes.xml"
     ]
 }
 
diff --git a/src/plugins/locator/locator.qbs b/src/plugins/locator/locator.qbs
index 651fece80aca8a0ba69167212c57401537152108..e93438998a44c35522c8dd47cabab6a6a0c376e9 100644
--- a/src/plugins/locator/locator.qbs
+++ b/src/plugins/locator/locator.qbs
@@ -21,20 +21,21 @@ QtcPlugin {
     ]
 
     files: [
-        "directoryfilter.ui",
-        "filesystemfilter.ui",
-        "locator.qrc",
-        "settingspage.ui",
         "basefilefilter.cpp",
         "basefilefilter.h",
         "commandlocator.cpp",
         "commandlocator.h",
         "directoryfilter.cpp",
         "directoryfilter.h",
+        "directoryfilter.ui",
+        "executefilter.cpp",
         "executefilter.h",
         "filesystemfilter.cpp",
         "filesystemfilter.h",
+        "filesystemfilter.ui",
         "ilocatorfilter.cpp",
+        "ilocatorfilter.h",
+        "locator.qrc",
         "locator_global.h",
         "locatorconstants.h",
         "locatorfiltersfilter.cpp",
@@ -43,16 +44,15 @@ QtcPlugin {
         "locatormanager.h",
         "locatorplugin.cpp",
         "locatorplugin.h",
+        "locatorwidget.cpp",
+        "locatorwidget.h",
         "opendocumentsfilter.cpp",
         "opendocumentsfilter.h",
         "settingspage.cpp",
         "settingspage.h",
-        "executefilter.cpp",
-        "ilocatorfilter.h",
-        "locatorwidget.cpp",
-        "locatorwidget.h",
+        "settingspage.ui",
         "images/locator.png",
-        "images/reload.png"
+        "images/reload.png",
     ]
 }
 
diff --git a/src/plugins/macros/macros.qbs b/src/plugins/macros/macros.qbs
index 40eb120dd971db4418a8c9e74d7c85ba99061952..15abb6e07f3063986eb5a0b705bacd1f5adfd629 100644
--- a/src/plugins/macros/macros.qbs
+++ b/src/plugins/macros/macros.qbs
@@ -20,9 +20,6 @@ QtcPlugin {
     ]
 
     files: [
-        "macrooptionswidget.ui",
-        "macros.qrc",
-        "savedialog.ui",
         "actionmacrohandler.cpp",
         "actionmacrohandler.h",
         "findmacrohandler.cpp",
@@ -41,6 +38,8 @@ QtcPlugin {
         "macrooptionspage.h",
         "macrooptionswidget.cpp",
         "macrooptionswidget.h",
+        "macrooptionswidget.ui",
+        "macros.qrc",
         "macros_global.h",
         "macrosconstants.h",
         "macrosplugin.cpp",
@@ -49,8 +48,9 @@ QtcPlugin {
         "macrotextfind.h",
         "savedialog.cpp",
         "savedialog.h",
+        "savedialog.ui",
         "texteditormacrohandler.cpp",
-        "texteditormacrohandler.h"
+        "texteditormacrohandler.h",
     ]
 }
 
diff --git a/src/plugins/madde/madde.qbs b/src/plugins/madde/madde.qbs
index 723c5d5e07da6171d9440f3eb6ca8e3de41eea38..8f84d46de99c150a27417bc69f546ec388a961fd 100644
--- a/src/plugins/madde/madde.qbs
+++ b/src/plugins/madde/madde.qbs
@@ -21,17 +21,23 @@ QtcPlugin {
     cpp.defines: base.concat(['QT_NO_CAST_TO_ASCII'])
 
     files: [
+        "debianmanager.cpp",
+        "debianmanager.h",
         "madde_exports.h",
+        "maddedevice.cpp",
+        "maddedevice.h",
         "maddedeviceconfigurationfactory.cpp",
         "maddedeviceconfigurationfactory.h",
         "maddedevicetester.cpp",
         "maddedevicetester.h",
         "maddeplugin.cpp",
         "maddeplugin.h",
-        "maddeuploadandinstallpackagesteps.cpp",
-        "maddeuploadandinstallpackagesteps.h",
         "maddeqemustartstep.cpp",
         "maddeqemustartstep.h",
+        "maddeuploadandinstallpackagesteps.cpp",
+        "maddeuploadandinstallpackagesteps.h",
+        "maemoapplicationrunnerhelperactions.cpp",
+        "maemoapplicationrunnerhelperactions.h",
         "maemoconstants.h",
         "maemodeploybymountsteps.cpp",
         "maemodeploybymountsteps.h",
@@ -112,11 +118,5 @@ QtcPlugin {
         "qt-maemo.qrc",
         "qt4maemodeployconfiguration.cpp",
         "qt4maemodeployconfiguration.h",
-        "maddedevice.cpp",
-        "maddedevice.h",
-        "debianmanager.h",
-        "debianmanager.cpp",
-        "maemoapplicationrunnerhelperactions.h",
-        "maemoapplicationrunnerhelperactions.cpp"
     ]
 }
diff --git a/src/plugins/mercurial/mercurial.qbs b/src/plugins/mercurial/mercurial.qbs
index 3875ddd979ccd6fc7ae78afa54a801c75f1b50d4..518d50bc1eaad4165c152659f96fe9b75b41ec28 100644
--- a/src/plugins/mercurial/mercurial.qbs
+++ b/src/plugins/mercurial/mercurial.qbs
@@ -20,38 +20,38 @@ QtcPlugin {
     ]
 
     files: [
-        "mercurialplugin.cpp",
-        "optionspage.cpp",
-        "mercurialcontrol.cpp",
-        "mercurialclient.cpp",
         "annotationhighlighter.cpp",
-        "mercurialeditor.cpp",
-        "revertdialog.cpp",
-        "srcdestdialog.cpp",
-        "mercurialcommitwidget.cpp",
-        "commiteditor.cpp",
-        "clonewizardpage.cpp",
+        "annotationhighlighter.h",
         "clonewizard.cpp",
-        "mercurialsettings.cpp",
-        "mercurialplugin.h",
+        "clonewizard.h",
+        "clonewizardpage.cpp",
+        "clonewizardpage.h",
+        "commiteditor.cpp",
+        "commiteditor.h",
         "constants.h",
-        "optionspage.h",
-        "mercurialcontrol.h",
+        "mercurial.qrc",
+        "mercurialclient.cpp",
         "mercurialclient.h",
-        "annotationhighlighter.h",
-        "mercurialeditor.h",
-        "revertdialog.h",
-        "srcdestdialog.h",
+        "mercurialcommitpanel.ui",
+        "mercurialcommitwidget.cpp",
         "mercurialcommitwidget.h",
-        "commiteditor.h",
-        "clonewizardpage.h",
-        "clonewizard.h",
+        "mercurialcontrol.cpp",
+        "mercurialcontrol.h",
+        "mercurialeditor.cpp",
+        "mercurialeditor.h",
+        "mercurialplugin.cpp",
+        "mercurialplugin.h",
+        "mercurialsettings.cpp",
         "mercurialsettings.h",
+        "optionspage.cpp",
+        "optionspage.h",
         "optionspage.ui",
+        "revertdialog.cpp",
+        "revertdialog.h",
         "revertdialog.ui",
+        "srcdestdialog.cpp",
+        "srcdestdialog.h",
         "srcdestdialog.ui",
-        "mercurialcommitpanel.ui",
-        "mercurial.qrc"
     ]
 }
 
diff --git a/src/plugins/perforce/perforce.qbs b/src/plugins/perforce/perforce.qbs
index 9c4c3d881b81fc1b23b748738d541b0594ecdbf5..ddf831b359e793b4b66af591f479d5f2b78f0623 100644
--- a/src/plugins/perforce/perforce.qbs
+++ b/src/plugins/perforce/perforce.qbs
@@ -20,34 +20,34 @@ QtcPlugin {
     ]
 
     files: [
-        "perforceplugin.h",
-        "perforcechecker.h",
-        "settingspage.h",
-        "perforceeditor.h",
+        "annotationhighlighter.cpp",
+        "annotationhighlighter.h",
+        "changenumberdialog.cpp",
         "changenumberdialog.h",
-        "perforcesubmiteditor.h",
+        "changenumberdialog.ui",
+        "pendingchangesdialog.cpp",
         "pendingchangesdialog.h",
-        "perforceconstants.h",
-        "perforceversioncontrol.h",
-        "perforcesettings.h",
-        "annotationhighlighter.h",
-        "perforcesubmiteditorwidget.h",
-        "perforceplugin.cpp",
+        "pendingchangesdialog.ui",
+        "perforce.qrc",
         "perforcechecker.cpp",
-        "settingspage.cpp",
+        "perforcechecker.h",
+        "perforceconstants.h",
         "perforceeditor.cpp",
-        "changenumberdialog.cpp",
-        "perforcesubmiteditor.cpp",
-        "pendingchangesdialog.cpp",
-        "perforceversioncontrol.cpp",
+        "perforceeditor.h",
+        "perforceplugin.cpp",
+        "perforceplugin.h",
         "perforcesettings.cpp",
-        "annotationhighlighter.cpp",
+        "perforcesettings.h",
+        "perforcesubmiteditor.cpp",
+        "perforcesubmiteditor.h",
         "perforcesubmiteditorwidget.cpp",
+        "perforcesubmiteditorwidget.h",
+        "perforceversioncontrol.cpp",
+        "perforceversioncontrol.h",
+        "settingspage.cpp",
+        "settingspage.h",
         "settingspage.ui",
-        "changenumberdialog.ui",
-        "pendingchangesdialog.ui",
         "submitpanel.ui",
-        "perforce.qrc"
     ]
 }
 
diff --git a/src/plugins/projectexplorer/projectexplorer.qbs b/src/plugins/projectexplorer/projectexplorer.qbs
index 36aa0fcbdbcefeedac9b04e5e7398d43edfa8613..84b8e16062d230b4ceb1e1f85be755d6e6d92acf 100644
--- a/src/plugins/projectexplorer/projectexplorer.qbs
+++ b/src/plugins/projectexplorer/projectexplorer.qbs
@@ -25,67 +25,89 @@ QtcPlugin {
     ]
 
     files: [
-        "doubletabwidget.ui",
-        "processstep.ui",
-        "projectexplorer.qrc",
-        "sessiondialog.ui",
-        "targetsettingswidget.ui",
-        "projectwizardpage.ui",
+        "abi.cpp",
         "abi.h",
         "abiwidget.cpp",
         "abiwidget.h",
         "abstractprocessstep.cpp",
         "abstractprocessstep.h",
         "allprojectsfilter.cpp",
+        "allprojectsfilter.h",
         "allprojectsfind.cpp",
         "allprojectsfind.h",
         "applicationlauncher.cpp",
         "applicationlauncher.h",
+        "applicationrunconfiguration.cpp",
         "applicationrunconfiguration.h",
+        "appoutputpane.cpp",
         "appoutputpane.h",
         "baseprojectwizarddialog.cpp",
         "baseprojectwizarddialog.h",
+        "buildconfiguration.cpp",
         "buildconfiguration.h",
         "buildconfigurationmodel.cpp",
         "buildconfigurationmodel.h",
         "buildenvironmentwidget.cpp",
         "buildenvironmentwidget.h",
+        "buildmanager.cpp",
         "buildmanager.h",
+        "buildprogress.cpp",
         "buildprogress.h",
+        "buildsettingspropertiespage.cpp",
         "buildsettingspropertiespage.h",
         "buildstep.cpp",
+        "buildstep.h",
         "buildsteplist.cpp",
         "buildsteplist.h",
+        "buildstepspage.cpp",
         "buildstepspage.h",
+        "buildtargetinfo.h",
         "cesdkhandler.cpp",
         "cesdkhandler.h",
+        "clangparser.cpp",
         "clangparser.h",
+        "codestylesettingspropertiespage.cpp",
         "codestylesettingspropertiespage.h",
         "codestylesettingspropertiespage.ui",
         "compileoutputwindow.cpp",
         "compileoutputwindow.h",
+        "copytaskhandler.cpp",
         "copytaskhandler.h",
         "corelistenercheckingforrunningbuild.cpp",
         "corelistenercheckingforrunningbuild.h",
         "currentprojectfilter.cpp",
+        "currentprojectfilter.h",
         "currentprojectfind.cpp",
         "currentprojectfind.h",
+        "dependenciespanel.cpp",
         "dependenciespanel.h",
+        "deployablefile.cpp",
+        "deployablefile.h",
         "deployconfiguration.cpp",
         "deployconfiguration.h",
         "deployconfigurationmodel.cpp",
         "deployconfigurationmodel.h",
+        "deploymentdata.h",
+        "doubletabwidget.cpp",
         "doubletabwidget.h",
+        "doubletabwidget.ui",
         "editorconfiguration.cpp",
         "editorconfiguration.h",
+        "editorsettingspropertiespage.cpp",
         "editorsettingspropertiespage.h",
         "editorsettingspropertiespage.ui",
         "environmentitemswidget.cpp",
+        "environmentitemswidget.h",
+        "environmentwidget.cpp",
         "environmentwidget.h",
         "foldernavigationwidget.cpp",
         "foldernavigationwidget.h",
+        "gccparser.cpp",
         "gccparser.h",
+        "gcctoolchain.cpp",
+        "gcctoolchain.h",
         "gcctoolchainfactories.h",
+        "gnumakeparser.cpp",
         "gnumakeparser.h",
         "headerpath.h",
         "ioutputparser.cpp",
@@ -93,21 +115,6 @@ QtcPlugin {
         "iprojectmanager.h",
         "iprojectproperties.h",
         "itaskhandler.h",
-        "ldparser.h",
-        "linuxiccparser.h",
-        "metatypedeclarations.h",
-        "miniprojecttargetselector.h",
-        "namedwidget.cpp",
-        "namedwidget.h",
-        "nodesvisitor.cpp",
-        "nodesvisitor.h",
-        "outputparser_test.h",
-        "pluginfilefactory.cpp",
-        "pluginfilefactory.h",
-        "processparameters.cpp",
-        "processparameters.h",
-        "processstep.cpp",
-        "processstep.h",
         "kit.cpp",
         "kit.h",
         "kitchooser.cpp",
@@ -125,29 +132,68 @@ QtcPlugin {
         "kitmodel.h",
         "kitoptionspage.cpp",
         "kitoptionspage.h",
+        "ldparser.cpp",
+        "ldparser.h",
+        "linuxiccparser.cpp",
+        "linuxiccparser.h",
+        "localapplicationruncontrol.cpp",
+        "localapplicationruncontrol.h",
+        "metatypedeclarations.h",
+        "miniprojecttargetselector.cpp",
+        "miniprojecttargetselector.h",
+        "namedwidget.cpp",
+        "namedwidget.h",
+        "nodesvisitor.cpp",
+        "nodesvisitor.h",
+        "outputparser_test.cpp",
+        "outputparser_test.h",
+        "pluginfilefactory.cpp",
+        "pluginfilefactory.h",
+        "processparameters.cpp",
+        "processparameters.h",
+        "processstep.cpp",
+        "processstep.h",
+        "processstep.ui",
         "project.cpp",
         "project.h",
         "projectconfiguration.cpp",
         "projectconfiguration.h",
+        "projectexplorer.cpp",
+        "projectexplorer.h",
+        "projectexplorer.qrc",
         "projectexplorer_export.h",
+        "projectexplorerconstants.h",
+        "projectexplorersettings.h",
+        "projectexplorersettingspage.cpp",
         "projectexplorersettingspage.h",
+        "projectexplorersettingspage.ui",
         "projectfilewizardextension.cpp",
         "projectfilewizardextension.h",
         "projectmodels.cpp",
         "projectmodels.h",
         "projectnodes.cpp",
         "projectnodes.h",
+        "projecttreewidget.cpp",
         "projecttreewidget.h",
+        "projectwelcomepage.cpp",
         "projectwelcomepage.h",
         "projectwindow.cpp",
         "projectwindow.h",
+        "projectwizardpage.cpp",
         "projectwizardpage.h",
+        "projectwizardpage.ui",
+        "runconfiguration.cpp",
+        "runconfiguration.h",
         "runconfigurationmodel.cpp",
         "runconfigurationmodel.h",
         "runsettingspropertiespage.cpp",
         "runsettingspropertiespage.h",
+        "session.cpp",
         "session.h",
+        "sessiondialog.cpp",
         "sessiondialog.h",
+        "sessiondialog.ui",
+        "settingsaccessor.cpp",
         "settingsaccessor.h",
         "showineditortaskhandler.cpp",
         "showineditortaskhandler.h",
@@ -161,87 +207,74 @@ QtcPlugin {
         "targetsettingspanel.h",
         "targetsettingswidget.cpp",
         "targetsettingswidget.h",
+        "targetsettingswidget.ui",
         "task.cpp",
         "task.h",
         "taskhub.cpp",
         "taskhub.h",
+        "taskmodel.cpp",
         "taskmodel.h",
+        "taskwindow.cpp",
         "taskwindow.h",
         "toolchain.cpp",
         "toolchain.h",
         "toolchainconfigwidget.cpp",
         "toolchainconfigwidget.h",
-        "toolchainmanager.h",
-        "toolchainoptionspage.h",
-        "vcsannotatetaskhandler.h",
-        "environmentitemswidget.h",
-        "abi.cpp",
-        "allprojectsfilter.h",
-        "applicationrunconfiguration.cpp",
-        "appoutputpane.cpp",
-        "buildconfiguration.cpp",
-        "buildmanager.cpp",
-        "buildprogress.cpp",
-        "buildsettingspropertiespage.cpp",
-        "buildstep.h",
-        "buildstepspage.cpp",
-        "clangparser.cpp",
-        "codestylesettingspropertiespage.cpp",
-        "copytaskhandler.cpp",
-        "currentprojectfilter.h",
-        "dependenciespanel.cpp",
-        "doubletabwidget.cpp",
-        "editorsettingspropertiespage.cpp",
-        "environmentwidget.cpp",
-        "gccparser.cpp",
-        "gcctoolchain.cpp",
-        "gcctoolchain.h",
-        "gnumakeparser.cpp",
-        "ldparser.cpp",
-        "linuxiccparser.cpp",
-        "localapplicationruncontrol.cpp",
-        "localapplicationruncontrol.h",
-        "miniprojecttargetselector.cpp",
-        "outputparser_test.cpp",
-        "projectexplorer.cpp",
-        "projectexplorer.h",
-        "projectexplorerconstants.h",
-        "projectexplorersettings.h",
-        "projectexplorersettingspage.cpp",
-        "projectexplorersettingspage.ui",
-        "projecttreewidget.cpp",
-        "projectwelcomepage.cpp",
-        "projectwizardpage.cpp",
-        "runconfiguration.cpp",
-        "runconfiguration.h",
-        "session.cpp",
-        "sessiondialog.cpp",
-        "settingsaccessor.cpp",
-        "taskmodel.cpp",
-        "taskwindow.cpp",
         "toolchainmanager.cpp",
+        "toolchainmanager.h",
         "toolchainoptionspage.cpp",
+        "toolchainoptionspage.h",
         "vcsannotatetaskhandler.cpp",
+        "vcsannotatetaskhandler.h",
+        "customwizard/customwizard.cpp",
         "customwizard/customwizard.h",
         "customwizard/customwizardpage.cpp",
         "customwizard/customwizardpage.h",
+        "customwizard/customwizardparameters.cpp",
         "customwizard/customwizardparameters.h",
         "customwizard/customwizardpreprocessor.cpp",
         "customwizard/customwizardpreprocessor.h",
         "customwizard/customwizardscriptgenerator.cpp",
         "customwizard/customwizardscriptgenerator.h",
-        "customwizard/customwizard.cpp",
-        "customwizard/customwizardparameters.cpp",
-        "deployablefile.h",
-        "deployablefile.cpp",
-        "deploymentdata.h",
-        "buildtargetinfo.h",
+        "devicesupport/desktopdevice.cpp",
+        "devicesupport/desktopdevice.h",
+        "devicesupport/desktopdevicefactory.cpp",
+        "devicesupport/desktopdevicefactory.h",
+        "devicesupport/deviceapplicationrunner.cpp",
+        "devicesupport/deviceapplicationrunner.h",
+        "devicesupport/devicefactoryselectiondialog.cpp",
+        "devicesupport/devicefactoryselectiondialog.h",
+        "devicesupport/devicefactoryselectiondialog.ui",
+        "devicesupport/devicemanager.cpp",
+        "devicesupport/devicemanager.h",
+        "devicesupport/devicemanagermodel.cpp",
+        "devicesupport/devicemanagermodel.h",
+        "devicesupport/deviceprocessesdialog.cpp",
+        "devicesupport/deviceprocessesdialog.h",
+        "devicesupport/deviceprocesslist.cpp",
+        "devicesupport/deviceprocesslist.h",
+        "devicesupport/devicesettingspage.cpp",
+        "devicesupport/devicesettingspage.h",
+        "devicesupport/devicesettingswidget.cpp",
+        "devicesupport/devicesettingswidget.h",
+        "devicesupport/devicesettingswidget.ui",
+        "devicesupport/deviceusedportsgatherer.cpp",
+        "devicesupport/deviceusedportsgatherer.h",
+        "devicesupport/idevice.cpp",
+        "devicesupport/idevice.h",
+        "devicesupport/idevicefactory.cpp",
+        "devicesupport/idevicefactory.h",
+        "devicesupport/idevicewidget.h",
+        "devicesupport/localprocesslist.cpp",
+        "devicesupport/localprocesslist.h",
+        "devicesupport/sshdeviceprocesslist.cpp",
+        "devicesupport/sshdeviceprocesslist.h",
         "images/BuildSettings.png",
         "images/CodeStyleSettings.png",
+        "images/Desktop.png",
         "images/DeviceConnected.png",
         "images/DeviceDisconnected.png",
         "images/DeviceReadyToUse.png",
-        "images/Desktop.png",
         "images/EditorSettings.png",
         "images/MaemoDevice.png",
         "images/ProjectDependencies.png",
@@ -270,69 +303,36 @@ QtcPlugin {
         "images/session.png",
         "images/stop.png",
         "images/stop_small.png",
-        "images/targetleftbutton.png",
-        "images/targetrightbutton.png",
         "images/targetbuildselected.png",
+        "images/targetleftbutton.png",
         "images/targetpanel_bottom.png",
         "images/targetpanel_gradient.png",
         "images/targetremovebutton.png",
         "images/targetremovebuttondark.png",
+        "images/targetrightbutton.png",
         "images/targetrunselected.png",
         "images/targetseparatorbackground.png",
         "images/targetunselected.png",
         "images/window.png",
-        "publishing/publishingwizardselectiondialog.ui",
         "publishing/ipublishingwizardfactory.h",
         "publishing/publishingwizardselectiondialog.cpp",
         "publishing/publishingwizardselectiondialog.h",
-        "devicesupport/idevice.h",
-        "devicesupport/idevice.cpp",
-        "devicesupport/desktopdevice.cpp",
-        "devicesupport/desktopdevice.h",
-        "devicesupport/desktopdevicefactory.cpp",
-        "devicesupport/desktopdevicefactory.h",
-        "devicesupport/devicemanager.h",
-        "devicesupport/devicemanager.cpp",
-        "devicesupport/devicemanagermodel.h",
-        "devicesupport/devicemanagermodel.cpp",
-        "devicesupport/devicesettingspage.h",
-        "devicesupport/devicesettingspage.cpp",
-        "devicesupport/devicefactoryselectiondialog.cpp",
-        "devicesupport/devicefactoryselectiondialog.h",
-        "devicesupport/devicefactoryselectiondialog.ui",
-        "devicesupport/deviceprocesslist.cpp",
-        "devicesupport/deviceprocesslist.h",
-        "devicesupport/sshdeviceprocesslist.cpp",
-        "devicesupport/sshdeviceprocesslist.h",
-        "devicesupport/deviceprocessesdialog.cpp",
-        "devicesupport/deviceprocessesdialog.h",
-        "devicesupport/devicesettingswidget.cpp",
-        "devicesupport/devicesettingswidget.h",
-        "devicesupport/devicesettingswidget.ui",
-        "devicesupport/deviceusedportsgatherer.cpp",
-        "devicesupport/deviceusedportsgatherer.h",
-        "devicesupport/idevicewidget.h",
-        "devicesupport/idevicefactory.cpp",
-        "devicesupport/idevicefactory.h",
-        "devicesupport/deviceapplicationrunner.cpp",
-        "devicesupport/deviceapplicationrunner.h",
-        "devicesupport/localprocesslist.h",
-        "devicesupport/localprocesslist.cpp"
+        "publishing/publishingwizardselectiondialog.ui",
     ]
 
     Group {
         condition: qbs.targetOS == "windows" || Defaults.testsEnabled(qbs)
         files: [
-           "wincetoolchain.cpp",
-           "wincetoolchain.h",
-           "windebuginterface.cpp",
-           "windebuginterface.h",
+           "abstractmsvctoolchain.cpp",
+           "abstractmsvctoolchain.h",
            "msvcparser.cpp",
            "msvcparser.h",
            "msvctoolchain.cpp",
            "msvctoolchain.h",
-           "abstractmsvctoolchain.cpp",
-           "abstractmsvctoolchain.h"
+           "wincetoolchain.cpp",
+           "wincetoolchain.h",
+           "windebuginterface.cpp",
+           "windebuginterface.h",
         ]
     }
 
diff --git a/src/plugins/qmldesigner/qmldesigner.qbs b/src/plugins/qmldesigner/qmldesigner.qbs
index e717eeb06e35564efca3fa8635b2974634f532b6..138d83abc341e3631aa26bfff39a8c9aa32b73f2 100644
--- a/src/plugins/qmldesigner/qmldesigner.qbs
+++ b/src/plugins/qmldesigner/qmldesigner.qbs
@@ -73,7 +73,7 @@ QtcPlugin {
             "removepropertyvisitor.cpp",
             "removepropertyvisitor.h",
             "removeuiobjectmembervisitor.cpp",
-            "removeuiobjectmembervisitor.h"
+            "removeuiobjectmembervisitor.h",
         ]
     }
 
@@ -145,13 +145,15 @@ QtcPlugin {
             "interfaces/commondefines.h",
             "interfaces/nodeinstanceclientinterface.h",
             "interfaces/nodeinstanceserverinterface.cpp",
-            "interfaces/nodeinstanceserverinterface.h"
+            "interfaces/nodeinstanceserverinterface.h",
         ]
     }
 
     Group {
         prefix: "designercore/"
         files: [
+            "rewritertransaction.cpp",
+            "rewritertransaction.h",
             "exceptions/exception.cpp",
             "exceptions/invalidargumentexception.cpp",
             "exceptions/invalididexception.cpp",
@@ -287,8 +289,6 @@ QtcPlugin {
             "pluginmanager/widgetpluginmanager.h",
             "pluginmanager/widgetpluginpath.cpp",
             "pluginmanager/widgetpluginpath.h",
-            "rewritertransaction.cpp",
-            "rewritertransaction.h"
         ]
     }
 
@@ -458,7 +458,7 @@ QtcPlugin {
             "stateseditor/stateseditorview.h",
             "stateseditor/stateseditorwidget.cpp",
             "stateseditor/stateseditorwidget.h",
-            "stateseditor/stateslist.qml"
+            "stateseditor/stateslist.qml",
         ]
     }
 
@@ -476,6 +476,6 @@ QtcPlugin {
         "settingspage.h",
         "settingspage.ui",
         "styledoutputpaneplaceholder.cpp",
-        "styledoutputpaneplaceholder.h"
+        "styledoutputpaneplaceholder.h",
     ]
 }
diff --git a/src/plugins/qmljseditor/qmljseditor.qbs b/src/plugins/qmljseditor/qmljseditor.qbs
index b78578ca995c3acf6fb32918feeeb404ed21acfe..fc5afc2322917bd4c81fb345baa2873c3f907cf8 100644
--- a/src/plugins/qmljseditor/qmljseditor.qbs
+++ b/src/plugins/qmljseditor/qmljseditor.qbs
@@ -26,8 +26,6 @@ QtcPlugin {
     ]
 
     files: [
-        "qmljseditor.qrc",
-        "quicktoolbarsettingspage.ui",
         "QmlJSEditor.mimetypes.xml",
         "jsfilewizard.cpp",
         "jsfilewizard.h",
@@ -46,6 +44,7 @@ QtcPlugin {
         "qmljscomponentnamedialog.ui",
         "qmljseditor.cpp",
         "qmljseditor.h",
+        "qmljseditor.qrc",
         "qmljseditor_global.h",
         "qmljseditoractionhandler.cpp",
         "qmljseditoractionhandler.h",
@@ -82,6 +81,7 @@ QtcPlugin {
         "qmljssnippetprovider.cpp",
         "qmljssnippetprovider.h",
         "qmljswrapinloader.cpp",
+        "qmljswrapinloader.h",
         "qmloutlinemodel.cpp",
         "qmloutlinemodel.h",
         "qmltaskmanager.cpp",
@@ -90,8 +90,8 @@ QtcPlugin {
         "quicktoolbar.h",
         "quicktoolbarsettingspage.cpp",
         "quicktoolbarsettingspage.h",
-        "qmljswrapinloader.h",
-        "images/qmlfile.png"
+        "quicktoolbarsettingspage.ui",
+        "images/qmlfile.png",
     ]
 
     ProductModule {
diff --git a/src/plugins/qmljstools/qmljstools.qbs b/src/plugins/qmljstools/qmljstools.qbs
index 85042a7675e46b050db507ad1a0528876b07ab09..2aea7349c0732a5f629d92e6922da46c4f5292c7 100644
--- a/src/plugins/qmljstools/qmljstools.qbs
+++ b/src/plugins/qmljstools/qmljstools.qbs
@@ -27,8 +27,8 @@ QtcPlugin {
     ]
 
     files: [
-        "qmljsmodelmanager.cpp",
-        "qmljsmodelmanager.h",
+        "qmljscodestylepreferencesfactory.cpp",
+        "qmljscodestylepreferencesfactory.h",
         "qmljscodestylesettingspage.cpp",
         "qmljscodestylesettingspage.h",
         "qmljscodestylesettingspage.ui",
@@ -41,6 +41,8 @@ QtcPlugin {
         "qmljslocatordata.cpp",
         "qmljslocatordata.h",
         "qmljsmodelmanager.cpp",
+        "qmljsmodelmanager.cpp",
+        "qmljsmodelmanager.h",
         "qmljsmodelmanager.h",
         "qmljsplugindumper.cpp",
         "qmljsplugindumper.h",
@@ -48,16 +50,14 @@ QtcPlugin {
         "qmljsqtstylecodeformatter.h",
         "qmljsrefactoringchanges.cpp",
         "qmljsrefactoringchanges.h",
+        "qmljssemanticinfo.cpp",
+        "qmljssemanticinfo.h",
         "qmljstools_global.h",
         "qmljstoolsconstants.h",
         "qmljstoolsplugin.cpp",
         "qmljstoolsplugin.h",
         "qmljstoolssettings.cpp",
         "qmljstoolssettings.h",
-        "qmljscodestylepreferencesfactory.cpp",
-        "qmljscodestylepreferencesfactory.h",
-        "qmljssemanticinfo.cpp",
-        "qmljssemanticinfo.h"
     ]
 
     Group {
diff --git a/src/plugins/qmlprofiler/qmlprofiler.qbs b/src/plugins/qmlprofiler/qmlprofiler.qbs
index 92fa17e5d4b4b32067877c716359d535b61bfc29..ef22fbf627d83a89109ab1e589f8a9ccf4146383 100644
--- a/src/plugins/qmlprofiler/qmlprofiler.qbs
+++ b/src/plugins/qmlprofiler/qmlprofiler.qbs
@@ -31,6 +31,7 @@ QtcPlugin {
         "abstractqmlprofilerrunner.h",
         "localqmlprofilerrunner.cpp",
         "localqmlprofilerrunner.h",
+        "qmlprofiler_global.h",
         "qmlprofilerattachdialog.cpp",
         "qmlprofilerattachdialog.h",
         "qmlprofilerattachdialog.ui",
@@ -45,7 +46,6 @@ QtcPlugin {
         "qmlprofilerengine.h",
         "qmlprofilereventview.cpp",
         "qmlprofilereventview.h",
-        "qmlprofiler_global.h",
         "qmlprofilerplugin.cpp",
         "qmlprofilerplugin.h",
         "qmlprofilerstatemanager.cpp",
@@ -75,6 +75,7 @@ QtcPlugin {
         "qml/Detail.qml",
         "qml/Label.qml",
         "qml/MainView.qml",
+        "qml/Overview.js",
         "qml/Overview.qml",
         "qml/RangeDetails.qml",
         "qml/RangeMover.qml",
@@ -84,7 +85,6 @@ QtcPlugin {
         "qml/TimeDisplay.qml",
         "qml/TimeMarks.qml",
         "qml/qmlprofiler.qrc",
-        "qml/Overview.js"
     ]
 }
 
diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs b/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
index 025861744fa6cbb001f2dfe191d9e37d4d985343..7d7879a487b407d1dcd89c09864ce547e02ee1fb 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
+++ b/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
@@ -22,37 +22,37 @@ QtcPlugin {
     ]
 
     files: [
-        "fileformat/qmlprojectitem.h",
-        "fileformat/filefilteritems.h",
-        "fileformat/qmlprojectfileformat.h",
+        "QmlProject.mimetypes.xml",
+        "qmlproject.cpp",
         "qmlproject.h",
-        "qmlprojectplugin.h",
-        "qmlprojectmanager.h",
+        "qmlproject.qrc",
+        "qmlprojectapplicationwizard.cpp",
+        "qmlprojectapplicationwizard.h",
         "qmlprojectconstants.h",
-        "qmlprojectnodes.h",
+        "qmlprojectfile.cpp",
         "qmlprojectfile.h",
-        "qmlprojectruncontrol.h",
-        "qmlprojectrunconfiguration.h",
-        "qmlprojectrunconfigurationfactory.h",
-        "qmlprojectapplicationwizard.h",
+        "qmlprojectmanager.cpp",
+        "qmlprojectmanager.h",
         "qmlprojectmanager_global.h",
         "qmlprojectmanagerconstants.h",
-        "qmlprojectrunconfigurationwidget.h",
-        "fileformat/qmlprojectitem.cpp",
-        "fileformat/filefilteritems.cpp",
-        "fileformat/qmlprojectfileformat.cpp",
-        "qmlproject.cpp",
-        "qmlprojectplugin.cpp",
-        "qmlprojectmanager.cpp",
         "qmlprojectnodes.cpp",
-        "qmlprojectfile.cpp",
-        "qmlprojectruncontrol.cpp",
+        "qmlprojectnodes.h",
+        "qmlprojectplugin.cpp",
+        "qmlprojectplugin.h",
         "qmlprojectrunconfiguration.cpp",
+        "qmlprojectrunconfiguration.h",
         "qmlprojectrunconfigurationfactory.cpp",
-        "qmlprojectapplicationwizard.cpp",
+        "qmlprojectrunconfigurationfactory.h",
         "qmlprojectrunconfigurationwidget.cpp",
-        "qmlproject.qrc",
-        "QmlProject.mimetypes.xml"
+        "qmlprojectrunconfigurationwidget.h",
+        "qmlprojectruncontrol.cpp",
+        "qmlprojectruncontrol.h",
+        "fileformat/filefilteritems.cpp",
+        "fileformat/filefilteritems.h",
+        "fileformat/qmlprojectfileformat.cpp",
+        "fileformat/qmlprojectfileformat.h",
+        "fileformat/qmlprojectitem.cpp",
+        "fileformat/qmlprojectitem.h",
     ]
 }
 
diff --git a/src/plugins/qnx/qnx.qbs b/src/plugins/qnx/qnx.qbs
index 27e89f17c9c96c13e4e8da43f19abca682d4beb7..b47e960b5ce54426a5c800b7ca0cf27c69f811c7 100644
--- a/src/plugins/qnx/qnx.qbs
+++ b/src/plugins/qnx/qnx.qbs
@@ -35,33 +35,33 @@ QtcPlugin {
         "blackberryapplicationrunner.h",
         "blackberryconnect.cpp",
         "blackberryconnect.h",
+        "blackberrycreatepackagestep.cpp",
+        "blackberrycreatepackagestep.h",
         "blackberrycreatepackagestepconfigwidget.cpp",
         "blackberrycreatepackagestepconfigwidget.h",
-        "blackberrycreatepackagestep.cpp",
         "blackberrycreatepackagestepfactory.cpp",
         "blackberrycreatepackagestepfactory.h",
-        "blackberrycreatepackagestep.h",
         "blackberrydebugsupport.cpp",
         "blackberrydebugsupport.h",
         "blackberrydeployconfiguration.cpp",
+        "blackberrydeployconfiguration.h",
         "blackberrydeployconfigurationfactory.cpp",
         "blackberrydeployconfigurationfactory.h",
-        "blackberrydeployconfiguration.h",
         "blackberrydeployconfigurationwidget.cpp",
         "blackberrydeployconfigurationwidget.h",
         "blackberrydeployconfigurationwidget.ui",
         "blackberrydeployinformation.cpp",
         "blackberrydeployinformation.h",
+        "blackberrydeploystep.cpp",
+        "blackberrydeploystep.h",
         "blackberrydeploystepconfigwidget.cpp",
         "blackberrydeploystepconfigwidget.h",
-        "blackberrydeploystep.cpp",
         "blackberrydeploystepfactory.cpp",
         "blackberrydeploystepfactory.h",
-        "blackberrydeploystep.h",
         "blackberrydeviceconfiguration.cpp",
+        "blackberrydeviceconfiguration.h",
         "blackberrydeviceconfigurationfactory.cpp",
         "blackberrydeviceconfigurationfactory.h",
-        "blackberrydeviceconfiguration.h",
         "blackberrydeviceconfigurationwidget.cpp",
         "blackberrydeviceconfigurationwidget.h",
         "blackberrydeviceconfigurationwidget.ui",
@@ -72,26 +72,25 @@ QtcPlugin {
         "blackberrydeviceconfigurationwizardsetuppage.ui",
         "blackberrydeviceconfigurationwizardsshkeypage.ui",
         "blackberryqtversion.cpp",
+        "blackberryqtversion.h",
         "blackberryqtversionfactory.cpp",
         "blackberryqtversionfactory.h",
-        "blackberryqtversion.h",
         "blackberryrunconfiguration.cpp",
+        "blackberryrunconfiguration.h",
         "blackberryrunconfigurationfactory.cpp",
         "blackberryrunconfigurationfactory.h",
-        "blackberryrunconfiguration.h",
         "blackberryrunconfigurationwidget.cpp",
         "blackberryrunconfigurationwidget.h",
         "blackberryrunconfigurationwidget.ui",
         "blackberryruncontrol.cpp",
+        "blackberryruncontrol.h",
         "blackberryruncontrolfactory.cpp",
         "blackberryruncontrolfactory.h",
-        "blackberryruncontrol.h",
         "blackberrywizardextension.cpp",
         "blackberrywizardextension.h",
-        "images/target.png",
-        "images/target-small.png",
         "pathchooserdelegate.cpp",
         "pathchooserdelegate.h",
+        "qnx.qrc",
         "qnxabstractqtversion.cpp",
         "qnxabstractqtversion.h",
         "qnxbaseqtconfigwidget.cpp",
@@ -101,35 +100,36 @@ QtcPlugin {
         "qnxdebugsupport.cpp",
         "qnxdebugsupport.h",
         "qnxdeployconfiguration.cpp",
+        "qnxdeployconfiguration.h",
         "qnxdeployconfigurationfactory.cpp",
         "qnxdeployconfigurationfactory.h",
-        "qnxdeployconfiguration.h",
         "qnxdeploystepfactory.cpp",
         "qnxdeploystepfactory.h",
         "qnxdeviceconfiguration.cpp",
+        "qnxdeviceconfiguration.h",
         "qnxdeviceconfigurationfactory.cpp",
         "qnxdeviceconfigurationfactory.h",
-        "qnxdeviceconfiguration.h",
         "qnxdeviceconfigurationwizard.cpp",
         "qnxdeviceconfigurationwizard.h",
         "qnxdeviceconfigurationwizardpages.cpp",
         "qnxdeviceconfigurationwizardpages.h",
         "qnxplugin.cpp",
         "qnxplugin.h",
-        "qnx.qrc",
         "qnxqtversion.cpp",
+        "qnxqtversion.h",
         "qnxqtversionfactory.cpp",
         "qnxqtversionfactory.h",
-        "qnxqtversion.h",
         "qnxrunconfiguration.cpp",
+        "qnxrunconfiguration.h",
         "qnxrunconfigurationfactory.cpp",
         "qnxrunconfigurationfactory.h",
-        "qnxrunconfiguration.h",
         "qnxruncontrol.cpp",
+        "qnxruncontrol.h",
         "qnxruncontrolfactory.cpp",
         "qnxruncontrolfactory.h",
-        "qnxruncontrol.h",
         "qnxutils.cpp",
-        "qnxutils.h"
+        "qnxutils.h",
+        "images/target-small.png",
+        "images/target.png",
     ]
 }
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.qbs b/src/plugins/qt4projectmanager/qt4projectmanager.qbs
index e8421967b5c9b47e121763019a98d18644a6ce41..bec27ebe296b99cfbe7e111f2b4176c75f39bbda 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager.qbs
+++ b/src/plugins/qt4projectmanager/qt4projectmanager.qbs
@@ -36,16 +36,17 @@ QtcPlugin {
 
     files: [
         "Qt4ProjectManager.mimetypes.xml",
-        "librarydetailswidget.ui",
-        "qt4projectmanager.qrc",
         "addlibrarywizard.cpp",
         "addlibrarywizard.h",
+        "buildconfigurationinfo.h",
         "externaleditors.cpp",
         "externaleditors.h",
         "findqt4profiles.cpp",
         "findqt4profiles.h",
         "librarydetailscontroller.cpp",
         "librarydetailscontroller.h",
+        "librarydetailswidget.ui",
+        "makestep.cpp",
         "makestep.h",
         "makestep.ui",
         "profilecompletionassist.cpp",
@@ -60,12 +61,12 @@ QtcPlugin {
         "profilehoverhandler.h",
         "profilekeywords.cpp",
         "profilekeywords.h",
-        "qmakeparser.cpp",
-        "qmakeparser.h",
         "qmakekitconfigwidget.cpp",
         "qmakekitconfigwidget.h",
         "qmakekitinformation.cpp",
         "qmakekitinformation.h",
+        "qmakeparser.cpp",
+        "qmakeparser.h",
         "qmakerunconfigurationfactory.cpp",
         "qmakerunconfigurationfactory.h",
         "qmakestep.cpp",
@@ -73,12 +74,16 @@ QtcPlugin {
         "qmakestep.ui",
         "qt4buildconfiguration.cpp",
         "qt4buildconfiguration.h",
+        "qt4nodes.cpp",
         "qt4nodes.h",
         "qt4project.cpp",
         "qt4project.h",
         "qt4projectconfigwidget.cpp",
         "qt4projectconfigwidget.h",
         "qt4projectconfigwidget.ui",
+        "qt4projectmanager.cpp",
+        "qt4projectmanager.h",
+        "qt4projectmanager.qrc",
         "qt4projectmanager_global.h",
         "qt4projectmanagerconstants.h",
         "qt4projectmanagerplugin.cpp",
@@ -95,22 +100,17 @@ QtcPlugin {
         "winceqtversion.h",
         "winceqtversionfactory.cpp",
         "winceqtversionfactory.h",
-        "buildconfigurationinfo.h",
-        "makestep.cpp",
-        "qt4nodes.cpp",
-        "qt4projectmanager.cpp",
-        "qt4projectmanager.h",
-        "customwidgetwizard/classdefinition.ui",
-        "customwidgetwizard/customwidgetpluginwizardpage.ui",
-        "customwidgetwizard/customwidgetwidgetswizardpage.ui",
         "customwidgetwizard/classdefinition.cpp",
         "customwidgetwizard/classdefinition.h",
+        "customwidgetwizard/classdefinition.ui",
         "customwidgetwizard/classlist.cpp",
         "customwidgetwizard/classlist.h",
         "customwidgetwizard/customwidgetpluginwizardpage.cpp",
         "customwidgetwizard/customwidgetpluginwizardpage.h",
+        "customwidgetwizard/customwidgetpluginwizardpage.ui",
         "customwidgetwizard/customwidgetwidgetswizardpage.cpp",
         "customwidgetwizard/customwidgetwidgetswizardpage.h",
+        "customwidgetwizard/customwidgetwidgetswizardpage.ui",
         "customwidgetwizard/customwidgetwizard.cpp",
         "customwidgetwizard/customwidgetwizard.h",
         "customwidgetwizard/customwidgetwizarddialog.cpp",
@@ -137,8 +137,6 @@ QtcPlugin {
         "qt-desktop/simulatorqtversion.h",
         "qt-desktop/simulatorqtversionfactory.cpp",
         "qt-desktop/simulatorqtversionfactory.h",
-        "wizards/testwizardpage.ui",
-        "wizards/wizards.qrc",
         "wizards/abstractmobileapp.cpp",
         "wizards/abstractmobileapp.h",
         "wizards/abstractmobileappwizard.cpp",
@@ -164,6 +162,9 @@ QtcPlugin {
         "wizards/html5appwizardpages.cpp",
         "wizards/html5appwizardpages.h",
         "wizards/html5appwizardsourcespage.ui",
+        "wizards/importwidget.cpp",
+        "wizards/importwidget.h",
+        "wizards/libraryparameters.cpp",
         "wizards/libraryparameters.h",
         "wizards/librarywizard.cpp",
         "wizards/librarywizard.h",
@@ -202,19 +203,18 @@ QtcPlugin {
         "wizards/subdirsprojectwizarddialog.h",
         "wizards/targetsetuppage.cpp",
         "wizards/targetsetuppage.h",
-        "wizards/importwidget.cpp",
-        "wizards/importwidget.h",
         "wizards/testwizard.cpp",
         "wizards/testwizard.h",
         "wizards/testwizarddialog.cpp",
         "wizards/testwizarddialog.h",
         "wizards/testwizardpage.cpp",
         "wizards/testwizardpage.h",
-        "wizards/libraryparameters.cpp",
+        "wizards/testwizardpage.ui",
+        "wizards/wizards.qrc",
         "wizards/images/console.png",
         "wizards/images/gui.png",
         "wizards/images/html5app.png",
         "wizards/images/lib.png",
-        "wizards/images/qtquickapp.png"
+        "wizards/images/qtquickapp.png",
     ]
 }
diff --git a/src/plugins/qtsupport/qtsupport.qbs b/src/plugins/qtsupport/qtsupport.qbs
index 4f9e272cac69b0810b2a2dd22200e66f8dd470f1..3cbac807c77be4c1df02de6d6650dd88a147bbaf 100644
--- a/src/plugins/qtsupport/qtsupport.qbs
+++ b/src/plugins/qtsupport/qtsupport.qbs
@@ -20,85 +20,90 @@ QtcPlugin {
         "../../libs",
         buildDirectory
     ]
-    cpp.defines: {
-        return base.concat([
-            "QT_NO_CAST_FROM_ASCII",
-            "QT_NO_CAST_TO_ASCII",
-            "QMAKE_AS_LIBRARY",
-            "QMAKE_LIBRARY",
-            "PROPARSER_THREAD_SAFE",
-            "PROEVALUATOR_THREAD_SAFE",
-            "PROEVALUATOR_CUMULATIVE",
-            "QMAKE_BUILTIN_PRFS",
-            "PROEVALUATOR_SETENV"
-        ])
+
+    cpp.defines: base.concat([
+        "QT_NO_CAST_FROM_ASCII",
+        "QT_NO_CAST_TO_ASCII",
+        "QMAKE_AS_LIBRARY",
+        "QMAKE_LIBRARY",
+        "PROPARSER_THREAD_SAFE",
+        "PROEVALUATOR_THREAD_SAFE",
+        "PROEVALUATOR_CUMULATIVE",
+        "QMAKE_BUILTIN_PRFS",
+        "PROEVALUATOR_SETENV"
+    ])
+
+    Group {
+        prefix: "../../shared/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",
+        ]
     }
 
     files: [
-        "../../shared/proparser/qmakebuiltins.cpp",
-        "../../shared/proparser/qmakeevaluator.cpp",
-        "../../shared/proparser/qmakeevaluator.h",
-        "../../shared/proparser/qmakeevaluator_p.h",
-        "../../shared/proparser/qmakeglobals.cpp",
-        "../../shared/proparser/qmakeglobals.h",
-        "../../shared/proparser/qmakeparser.cpp",
-        "../../shared/proparser/qmakeparser.h",
-        "../../shared/proparser/qmake_global.h",
-        "../../shared/proparser/profileevaluator.cpp",
-        "../../shared/proparser/profileevaluator.h",
-        "../../shared/proparser/proitems.cpp",
-        "../../shared/proparser/proitems.h",
-        "../../shared/proparser/prowriter.cpp",
-        "../../shared/proparser/prowriter.h",
-        "../../shared/proparser/proparser.qrc",
-        "../../shared/proparser/ioutils.h",
-        "../../shared/proparser/ioutils.cpp",
-        "qtversioninfo.ui",
-        "qtversionmanager.ui",
+        "baseqtversion.cpp",
         "baseqtversion.h",
+        "customexecutableconfigurationwidget.cpp",
+        "customexecutableconfigurationwidget.h",
+        "customexecutablerunconfiguration.cpp",
+        "customexecutablerunconfiguration.h",
         "debugginghelper.cpp",
         "debugginghelper.h",
         "debugginghelper.ui",
+        "debugginghelperbuildtask.cpp",
         "debugginghelperbuildtask.h",
+        "exampleslistmodel.cpp",
         "exampleslistmodel.h",
+        "gettingstartedwelcomepage.cpp",
         "gettingstartedwelcomepage.h",
         "profilereader.cpp",
         "profilereader.h",
+        "qmldebugginglibrary.cpp",
         "qmldebugginglibrary.h",
+        "qmldumptool.cpp",
         "qmldumptool.h",
+        "qmlobservertool.cpp",
         "qmlobservertool.h",
-        "qtoptionspage.h",
-        "qtoutputformatter.cpp",
-        "qtoutputformatter.h",
-        "qtparser.h",
         "qtkitconfigwidget.cpp",
         "qtkitconfigwidget.h",
         "qtkitinformation.cpp",
         "qtkitinformation.h",
+        "qtoptionspage.cpp",
+        "qtoptionspage.h",
+        "qtoutputformatter.cpp",
+        "qtoutputformatter.h",
+        "qtparser.cpp",
+        "qtparser.h",
         "qtsupport_global.h",
         "qtsupportconstants.h",
         "qtsupportplugin.cpp",
         "qtsupportplugin.h",
+        "qtversionfactory.cpp",
         "qtversionfactory.h",
+        "qtversioninfo.ui",
+        "qtversionmanager.cpp",
         "qtversionmanager.h",
+        "qtversionmanager.ui",
         "screenshotcropper.cpp",
         "screenshotcropper.h",
         "showbuildlog.ui",
-        "baseqtversion.cpp",
-        "customexecutableconfigurationwidget.cpp",
-        "customexecutableconfigurationwidget.h",
-        "customexecutablerunconfiguration.cpp",
-        "customexecutablerunconfiguration.h",
-        "debugginghelperbuildtask.cpp",
-        "exampleslistmodel.cpp",
-        "gettingstartedwelcomepage.cpp",
-        "qmldebugginglibrary.cpp",
-        "qmldumptool.cpp",
-        "qmlobservertool.cpp",
-        "qtoptionspage.cpp",
-        "qtparser.cpp",
-        "qtversionfactory.cpp",
-        "qtversionmanager.cpp"
     ]
 
     ProductModule {
diff --git a/src/plugins/remotelinux/remotelinux.qbs b/src/plugins/remotelinux/remotelinux.qbs
index 3bb4c43ef520f01e105d62ece8742447459792e1..c5dda762fc574ddae494b7aa07a1371b7c84af2b 100644
--- a/src/plugins/remotelinux/remotelinux.qbs
+++ b/src/plugins/remotelinux/remotelinux.qbs
@@ -24,6 +24,7 @@ QtcPlugin {
         "abstractpackagingstep.h",
         "abstractremotelinuxdeployservice.cpp",
         "abstractremotelinuxdeployservice.h",
+        "abstractremotelinuxdeploystep.cpp",
         "abstractremotelinuxdeploystep.h",
         "abstractuploadandinstallpackageservice.cpp",
         "abstractuploadandinstallpackageservice.h",
@@ -32,30 +33,41 @@ QtcPlugin {
         "embeddedlinuxqtversionfactory.cpp",
         "embeddedlinuxqtversionfactory.h",
         "genericdirectuploadservice.cpp",
+        "genericdirectuploadservice.h",
+        "genericdirectuploadstep.cpp",
         "genericdirectuploadstep.h",
         "genericlinuxdeviceconfigurationfactory.cpp",
         "genericlinuxdeviceconfigurationfactory.h",
+        "genericlinuxdeviceconfigurationwidget.cpp",
+        "genericlinuxdeviceconfigurationwidget.h",
+        "genericlinuxdeviceconfigurationwidget.ui",
         "genericlinuxdeviceconfigurationwizard.cpp",
         "genericlinuxdeviceconfigurationwizard.h",
         "genericlinuxdeviceconfigurationwizardpages.cpp",
         "genericlinuxdeviceconfigurationwizardpages.h",
         "genericlinuxdeviceconfigurationwizardsetuppage.ui",
-        "genericlinuxdeviceconfigurationwidget.cpp",
-        "genericlinuxdeviceconfigurationwidget.h",
-        "genericlinuxdeviceconfigurationwidget.ui",
         "genericremotelinuxdeploystepfactory.cpp",
         "genericremotelinuxdeploystepfactory.h",
         "linuxdevice.cpp",
         "linuxdevice.h",
         "linuxdevicetestdialog.cpp",
         "linuxdevicetestdialog.h",
+        "linuxdevicetestdialog.ui",
         "linuxdevicetester.cpp",
         "linuxdevicetester.h",
+        "packageuploader.cpp",
+        "packageuploader.h",
         "publickeydeploymentdialog.cpp",
         "publickeydeploymentdialog.h",
         "remotelinux.qrc",
         "remotelinux_constants.h",
         "remotelinux_export.h",
+        "remotelinuxcheckforfreediskspaceservice.cpp",
+        "remotelinuxcheckforfreediskspaceservice.h",
+        "remotelinuxcheckforfreediskspacestep.cpp",
+        "remotelinuxcheckforfreediskspacestep.h",
+        "remotelinuxcheckforfreediskspacestepwidget.ui",
+        "remotelinuxcustomcommanddeploymentstep.cpp",
         "remotelinuxcustomcommanddeploymentstep.h",
         "remotelinuxcustomcommanddeployservice.cpp",
         "remotelinuxcustomcommanddeployservice.h",
@@ -67,7 +79,13 @@ QtcPlugin {
         "remotelinuxdeployconfigurationfactory.h",
         "remotelinuxdeployconfigurationwidget.cpp",
         "remotelinuxdeployconfigurationwidget.h",
+        "remotelinuxdeployconfigurationwidget.ui",
+        "remotelinuxdeploymentdatamodel.cpp",
+        "remotelinuxdeploymentdatamodel.h",
+        "remotelinuxenvironmentreader.cpp",
+        "remotelinuxenvironmentreader.h",
         "remotelinuxpackageinstaller.cpp",
+        "remotelinuxpackageinstaller.h",
         "remotelinuxplugin.cpp",
         "remotelinuxplugin.h",
         "remotelinuxrunconfiguration.cpp",
@@ -76,39 +94,21 @@ QtcPlugin {
         "remotelinuxrunconfigurationfactory.h",
         "remotelinuxrunconfigurationwidget.cpp",
         "remotelinuxrunconfigurationwidget.h",
+        "remotelinuxruncontrol.cpp",
         "remotelinuxruncontrol.h",
+        "remotelinuxruncontrolfactory.cpp",
+        "remotelinuxruncontrolfactory.h",
         "remotelinuxutils.cpp",
         "remotelinuxutils.h",
-        "tarpackagecreationstep.h",
-        "uploadandinstalltarpackagestep.h",
-        "genericdirectuploadservice.h",
-        "linuxdevicetestdialog.ui",
-        "packageuploader.cpp",
-        "packageuploader.h",
-        "remotelinuxdeployconfigurationwidget.ui",
-        "remotelinuxenvironmentreader.cpp",
-        "remotelinuxenvironmentreader.h",
-        "remotelinuxpackageinstaller.h",
         "sshkeydeployer.cpp",
         "sshkeydeployer.h",
+        "tarpackagecreationstep.cpp",
+        "tarpackagecreationstep.h",
         "typespecificdeviceconfigurationlistmodel.cpp",
         "typespecificdeviceconfigurationlistmodel.h",
-        "abstractremotelinuxdeploystep.cpp",
-        "genericdirectuploadstep.cpp",
-        "remotelinuxcustomcommanddeploymentstep.cpp",
-        "remotelinuxruncontrol.cpp",
-        "remotelinuxruncontrolfactory.cpp",
-        "remotelinuxruncontrolfactory.h",
-        "tarpackagecreationstep.cpp",
         "uploadandinstalltarpackagestep.cpp",
-        "remotelinuxcheckforfreediskspaceservice.h",
-        "remotelinuxcheckforfreediskspaceservice.cpp",
-        "remotelinuxcheckforfreediskspacestep.h",
-        "remotelinuxcheckforfreediskspacestep.cpp",
-        "remotelinuxcheckforfreediskspacestepwidget.ui",
-        "remotelinuxdeploymentdatamodel.h",
-        "remotelinuxdeploymentdatamodel.cpp",
-        "images/embeddedtarget.png"
+        "uploadandinstalltarpackagestep.h",
+        "images/embeddedtarget.png",
     ]
 
     ProductModule {
diff --git a/src/plugins/resourceeditor/resourceeditor.qbs b/src/plugins/resourceeditor/resourceeditor.qbs
index 68dc1df8bc1c1748ffd47c8c817be2b0614fd5b7..9f51b8b086476d5ba4e4e35dd3e4949b3b5ceb4e 100644
--- a/src/plugins/resourceeditor/resourceeditor.qbs
+++ b/src/plugins/resourceeditor/resourceeditor.qbs
@@ -31,15 +31,15 @@ QtcPlugin {
         "resourceeditorw.h",
         "resourcewizard.cpp",
         "resourcewizard.h",
-        "qrceditor/resourcefile.cpp",
-        "qrceditor/resourceview.cpp",
         "qrceditor/qrceditor.cpp",
-        "qrceditor/undocommands.cpp",
+        "qrceditor/qrceditor.h",
+        "qrceditor/qrceditor.ui",
+        "qrceditor/resourcefile.cpp",
         "qrceditor/resourcefile_p.h",
+        "qrceditor/resourceview.cpp",
         "qrceditor/resourceview.h",
-        "qrceditor/qrceditor.h",
+        "qrceditor/undocommands.cpp",
         "qrceditor/undocommands_p.h",
-        "qrceditor/qrceditor.ui"
     ]
 }
 
diff --git a/src/plugins/subversion/subversion.qbs b/src/plugins/subversion/subversion.qbs
index bed2a9aea38977cc55ab6bbdf93e7da250292caa..d4769f818b04a8a3b7efbabecca1c18efb4139db 100644
--- a/src/plugins/subversion/subversion.qbs
+++ b/src/plugins/subversion/subversion.qbs
@@ -20,27 +20,27 @@ QtcPlugin {
     ]
 
     files: [
+        "annotationhighlighter.cpp",
         "annotationhighlighter.h",
-        "subversionplugin.h",
-        "subversioncontrol.h",
-        "settingspage.h",
-        "subversioneditor.h",
-        "subversionsubmiteditor.h",
-        "subversionsettings.h",
+        "checkoutwizard.cpp",
         "checkoutwizard.h",
+        "checkoutwizardpage.cpp",
         "checkoutwizardpage.h",
+        "settingspage.cpp",
+        "settingspage.h",
+        "settingspage.ui",
+        "subversion.qrc",
         "subversionconstants.h",
-        "annotationhighlighter.cpp",
-        "subversionplugin.cpp",
         "subversioncontrol.cpp",
-        "settingspage.cpp",
+        "subversioncontrol.h",
         "subversioneditor.cpp",
-        "subversionsubmiteditor.cpp",
+        "subversioneditor.h",
+        "subversionplugin.cpp",
+        "subversionplugin.h",
         "subversionsettings.cpp",
-        "checkoutwizard.cpp",
-        "checkoutwizardpage.cpp",
-        "settingspage.ui",
-        "subversion.qrc"
+        "subversionsettings.h",
+        "subversionsubmiteditor.cpp",
+        "subversionsubmiteditor.h",
     ]
 }
 
diff --git a/src/plugins/tasklist/tasklist.qbs b/src/plugins/tasklist/tasklist.qbs
index 8dc99abeae865c964b6a302705a3e2826bfaf927..9f0a56620d2f939b7e673bc0d2fdc9e7709c3406 100644
--- a/src/plugins/tasklist/tasklist.qbs
+++ b/src/plugins/tasklist/tasklist.qbs
@@ -20,18 +20,18 @@ QtcPlugin {
     ]
 
     files: [
-        "tasklistplugin.h",
-        "tasklist_export.h",
-        "tasklistconstants.h",
-        "stopmonitoringhandler.h",
-        "taskfile.h",
-        "taskfilefactory.h",
-        "tasklistplugin.cpp",
+        "TaskList.mimetypes.xml",
         "stopmonitoringhandler.cpp",
+        "stopmonitoringhandler.h",
         "taskfile.cpp",
+        "taskfile.h",
         "taskfilefactory.cpp",
+        "taskfilefactory.h",
         "tasklist.qrc",
-        "TaskList.mimetypes.xml"
+        "tasklist_export.h",
+        "tasklistconstants.h",
+        "tasklistplugin.cpp",
+        "tasklistplugin.h",
     ]
 }
 
diff --git a/src/plugins/texteditor/texteditor.qbs b/src/plugins/texteditor/texteditor.qbs
index fc8d3957796c8aebb9ecece0734cb37c497efec7..aa98ab169fcc6954da038342242e7f034a793bad 100644
--- a/src/plugins/texteditor/texteditor.qbs
+++ b/src/plugins/texteditor/texteditor.qbs
@@ -62,10 +62,10 @@ QtcPlugin {
         "codestyleselectorwidget.h",
         "codestyleselectorwidget.ui",
         "colorscheme.cpp",
+        "colorscheme.h",
         "colorschemeedit.cpp",
         "colorschemeedit.h",
         "colorschemeedit.ui",
-        "colorscheme.h",
         "completionsettings.cpp",
         "completionsettings.h",
         "convenience.cpp",
@@ -91,9 +91,9 @@ QtcPlugin {
         "helpitem.cpp",
         "helpitem.h",
         "icodestylepreferences.cpp",
+        "icodestylepreferences.h",
         "icodestylepreferencesfactory.cpp",
         "icodestylepreferencesfactory.h",
-        "icodestylepreferences.h",
         "indenter.cpp",
         "indenter.h",
         "ioutlinewidget.h",
@@ -108,9 +108,9 @@ QtcPlugin {
         "outlinefactory.cpp",
         "outlinefactory.h",
         "plaintexteditor.cpp",
+        "plaintexteditor.h",
         "plaintexteditorfactory.cpp",
         "plaintexteditorfactory.h",
-        "plaintexteditor.h",
         "quickfix.cpp",
         "quickfix.h",
         "refactoringchanges.cpp",
@@ -132,18 +132,18 @@ QtcPlugin {
         "tabsettingswidget.cpp",
         "tabsettingswidget.h",
         "tabsettingswidget.ui",
+        "texteditor.qrc",
+        "texteditor_global.h",
         "texteditoractionhandler.cpp",
         "texteditoractionhandler.h",
         "texteditorconstants.cpp",
         "texteditorconstants.h",
-        "texteditor_global.h",
         "texteditoroptionspage.cpp",
         "texteditoroptionspage.h",
         "texteditoroverlay.cpp",
         "texteditoroverlay.h",
         "texteditorplugin.cpp",
         "texteditorplugin.h",
-        "texteditor.qrc",
         "texteditorsettings.cpp",
         "texteditorsettings.h",
         "textfilewizard.cpp",
@@ -217,8 +217,8 @@ QtcPlugin {
             "highlightdefinitionmetadata.cpp",
             "highlightdefinitionmetadata.h",
             "highlighter.cpp",
-            "highlighterexception.h",
             "highlighter.h",
+            "highlighterexception.h",
             "highlightersettings.cpp",
             "highlightersettings.h",
             "highlightersettingspage.cpp",
@@ -253,12 +253,12 @@ QtcPlugin {
             "plaintextsnippetprovider.cpp",
             "plaintextsnippetprovider.h",
             "reuse.h",
+            "snippet.cpp",
+            "snippet.h",
             "snippetassistcollector.cpp",
             "snippetassistcollector.h",
-            "snippet.cpp",
             "snippeteditor.cpp",
             "snippeteditor.h",
-            "snippet.h",
             "snippetscollection.cpp",
             "snippetscollection.h",
             "snippetssettings.cpp",
@@ -281,7 +281,7 @@ QtcPlugin {
             "tips.cpp",
             "tips.h",
             "tooltip.cpp",
-            "tooltip.h"
+            "tooltip.h",
         ]
     }
 
diff --git a/src/plugins/todo/todo.qbs b/src/plugins/todo/todo.qbs
index 8629356c0e2e736bd2e4b03b0ef9d90500422292..eb9c48f419b9c6d33727cd269497ba5d34994bac 100644
--- a/src/plugins/todo/todo.qbs
+++ b/src/plugins/todo/todo.qbs
@@ -26,10 +26,10 @@ QtcPlugin {
         "cpptodoitemsscanner.cpp",
         "cpptodoitemsscanner.h",
         "keyword.cpp",
+        "keyword.h",
         "keyworddialog.cpp",
         "keyworddialog.h",
         "keyworddialog.ui",
-        "keyword.h",
         "lineparser.cpp",
         "lineparser.h",
         "optionsdialog.cpp",
@@ -52,6 +52,6 @@ QtcPlugin {
         "todooutputpane.h",
         "todoplugin.cpp",
         "todoplugin.h",
-        "todoplugin.qrc"
+        "todoplugin.qrc",
     ]
 }
diff --git a/src/plugins/updateinfo/updateinfo.qbs b/src/plugins/updateinfo/updateinfo.qbs
index 716ff5e6868e71e7eb361976680b97ba3e3b748d..de317201740946b7d0c9530b29cb45219734342f 100644
--- a/src/plugins/updateinfo/updateinfo.qbs
+++ b/src/plugins/updateinfo/updateinfo.qbs
@@ -21,6 +21,6 @@ QtcPlugin {
         "updateinfobutton.cpp",
         "updateinfobutton.h",
         "updateinfoplugin.cpp",
-        "updateinfoplugin.h"
+        "updateinfoplugin.h",
     ]
 }
diff --git a/src/plugins/valgrind/valgrind.qbs b/src/plugins/valgrind/valgrind.qbs
index dfdc6d65827d4d209f87942016d35bfc31d8b6cd..d6cb68337242d51b1a4dc4230d7a0c6f00f0392c 100644
--- a/src/plugins/valgrind/valgrind.qbs
+++ b/src/plugins/valgrind/valgrind.qbs
@@ -54,16 +54,16 @@ QtcPlugin {
         "valgrindengine.h",
         "valgrindplugin.cpp",
         "valgrindplugin.h",
+        "valgrindprocess.cpp",
+        "valgrindprocess.h",
+        "valgrindrunner.cpp",
+        "valgrindrunner.h",
         "valgrindsettings.cpp",
         "valgrindsettings.h",
         "valgrindtool.cpp",
         "valgrindtool.h",
         "workarounds.cpp",
         "workarounds.h",
-        "valgrindprocess.cpp",
-        "valgrindprocess.h",
-        "valgrindrunner.cpp",
-        "valgrindrunner.h",
         "callgrind/callgrindabstractmodel.h",
         "callgrind/callgrindcallmodel.cpp",
         "callgrind/callgrindcallmodel.h",
@@ -115,7 +115,7 @@ QtcPlugin {
         "xmlprotocol/suppression.cpp",
         "xmlprotocol/suppression.h",
         "xmlprotocol/threadedparser.cpp",
-        "xmlprotocol/threadedparser.h"
+        "xmlprotocol/threadedparser.h",
     ]
 }
 
diff --git a/src/plugins/vcsbase/vcsbase.qbs b/src/plugins/vcsbase/vcsbase.qbs
index 91245e75d84482b50ea0f273cfc46dbfbd796424..68ee417077c1801a647d6125d2c9daa8d12dc67e 100644
--- a/src/plugins/vcsbase/vcsbase.qbs
+++ b/src/plugins/vcsbase/vcsbase.qbs
@@ -24,8 +24,6 @@ QtcPlugin {
 
     files: [
         "VcsBase.mimetypes.xml",
-        "vcsbase.qrc",
-        "vcsbase_global.h",
         "baseannotationhighlighter.cpp",
         "baseannotationhighlighter.h",
         "basecheckoutwizard.cpp",
@@ -65,6 +63,8 @@ QtcPlugin {
         "submiteditorfile.h",
         "submitfilemodel.cpp",
         "submitfilemodel.h",
+        "vcsbase.qrc",
+        "vcsbase_global.h",
         "vcsbaseclient.cpp",
         "vcsbaseclient.h",
         "vcsbaseclientsettings.cpp",
@@ -87,7 +87,7 @@ QtcPlugin {
         "vcsplugin.cpp",
         "vcsplugin.h",
         "images/diff.png",
-        "images/submit.png"
+        "images/submit.png",
     ]
 }
 
diff --git a/src/plugins/welcome/welcome.qbs b/src/plugins/welcome/welcome.qbs
index e3f6670e769d720e912a64fe67a2505bcd0f6823..01c277c1680dd2a365893d115fc604194c112d61 100644
--- a/src/plugins/welcome/welcome.qbs
+++ b/src/plugins/welcome/welcome.qbs
@@ -21,7 +21,7 @@ QtcPlugin {
     files: [
         "welcome_global.h",
         "welcomeplugin.cpp",
-        "welcomeplugin.h"
+        "welcomeplugin.h",
     ]
 }
 
diff --git a/src/tools/qtcdebugger/qtcdebugger.qbs b/src/tools/qtcdebugger/qtcdebugger.qbs
index bc416fb95be83055eafb911425419d4d354a1fa7..5b86287746526c9ef214b52bf446530a87df580b 100644
--- a/src/tools/qtcdebugger/qtcdebugger.qbs
+++ b/src/tools/qtcdebugger/qtcdebugger.qbs
@@ -21,6 +21,6 @@ QtcTool {
     files: [
         "main.cpp",
         "../../shared/registryaccess/registryaccess.cpp",
-        "../../shared/registryaccess/registryaccess.h"
+        "../../shared/registryaccess/registryaccess.h",
     ]
 }
diff --git a/src/tools/qtcreatorcrashhandler/qtcreatorcrashhandler.qbs b/src/tools/qtcreatorcrashhandler/qtcreatorcrashhandler.qbs
index 820f26d68c1aacf873bf3e67bc7999231cee8dcf..67e5d574b8ac2035e86a5ff26ad2f3deb7741f53 100644
--- a/src/tools/qtcreatorcrashhandler/qtcreatorcrashhandler.qbs
+++ b/src/tools/qtcreatorcrashhandler/qtcreatorcrashhandler.qbs
@@ -14,15 +14,15 @@ QtcTool {
     Depends { name: "app_version_header" }
 
     files: [
-        "main.cpp",
         "backtracecollector.cpp",
         "backtracecollector.h",
-        "crashhandlerdialog.cpp",
-        "crashhandlerdialog.h",
         "crashhandler.cpp",
         "crashhandler.h",
+        "crashhandlerdialog.cpp",
+        "crashhandlerdialog.h",
+        "crashhandlerdialog.ui",
+        "main.cpp",
         "utils.cpp",
         "utils.h",
-        "crashhandlerdialog.ui"
     ]
 }
diff --git a/src/tools/sdktool/sdktool.qbs b/src/tools/sdktool/sdktool.qbs
index 1ecea9e4c1c218d4088997056a82189a3d43d095..6a2f12803e0d172ac0064ecb1aa945ac4ad815b6 100644
--- a/src/tools/sdktool/sdktool.qbs
+++ b/src/tools/sdktool/sdktool.qbs
@@ -14,7 +14,6 @@ QtcTool {
     Depends { name: "app_version_header" }
 
     files: [
-        "main.cpp",
         "addkeysoperation.cpp",
         "addkeysoperation.h",
         "addkitoperation.cpp",
@@ -29,8 +28,9 @@ QtcTool {
         "findvalueoperation.h",
         "getoperation.cpp",
         "getoperation.h",
-        "operation.h",
+        "main.cpp",
         "operation.cpp",
+        "operation.h",
         "rmkeysoperation.cpp",
         "rmkeysoperation.h",
         "rmkitoperation.cpp",
@@ -40,6 +40,6 @@ QtcTool {
         "rmtoolchainoperation.cpp",
         "rmtoolchainoperation.h",
         "settings.cpp",
-        "settings.h"
+        "settings.h",
     ]
 }