qbs files: Sort files

Change-Id: I6514deb70162bd52687e6143813bcf1325a797db
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

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",
         ]
     }

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",
     ]
 }

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 {

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",

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 {

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",
     ]
 }
 

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 {

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 {

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 {

src/libs/qtcomponents/styleitem/styleitem.qbs

@@ -27,7 +27,7 @@ DynamicLibrary {
         "qtmenuitem.cpp",
         "qtmenuitem.h",
         "qwheelarea.cpp",
-        "qwheelarea.h"
+        "qwheelarea.h",
     ]
 }
 

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 {

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"
         ]
     }
 

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 {

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 {

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",