1 files changed, 242 insertions, 320 deletions

diff --git a/src/plugins/projectexplorer/projectexplorer.qbs b/src/plugins/projectexplorer/projectexplorer.qbs
index 55dd5a3432..3772f33c08 100644
--- a/src/plugins/projectexplorer/projectexplorer.qbs
+++ b/src/plugins/projectexplorer/projectexplorer.qbs
@@ -1,12 +1,13 @@
 import qbs.base 1.0
 
+import "../../../qbs/functions.js" as QtcFunctions
 import "../QtcPlugin.qbs" as QtcPlugin
-import "../../../qbs/defaults.js" as Defaults
 
 QtcPlugin {
     name: "ProjectExplorer"
 
-    Depends { name: "Qt"; submodules: ["widgets", "xml", "network", "script", "declarative"] }
+    Depends { name: "Qt"; submodules: ["widgets", "xml", "network", "script"] }
+    Depends { name: "Qt.quick"; condition: QtcFunctions.versionIsAtLeast(Qt.core.version, "5.1"); }
     Depends { name: "Core" }
     Depends { name: "Locator" }
     Depends { name: "Find" }
@@ -14,327 +15,248 @@ QtcPlugin {
     Depends { name: "QtcSsh" }
 
     cpp.defines: base.concat("QTC_CPU=X86Architecture")
-    cpp.includePaths: base.concat([
-        "customwizard",
-        "publishing"
-    ])
+    Properties {
+        condition: qbs.targetOS.contains("osx")
+        cpp.frameworks: base.concat(["Carbon"])
+    }
+
+    Group {
+        name: "General"
+        files: [
+            "abi.cpp", "abi.h",
+            "abiwidget.cpp", "abiwidget.h",
+            "abstractprocessstep.cpp", "abstractprocessstep.h",
+            "allprojectsfilter.cpp", "allprojectsfilter.h",
+            "allprojectsfind.cpp", "allprojectsfind.h",
+            "ansifilterparser.cpp", "ansifilterparser.h",
+            "applicationlauncher.cpp", "applicationlauncher.h",
+            "appoutputpane.cpp", "appoutputpane.h",
+            "baseprojectwizarddialog.cpp", "baseprojectwizarddialog.h",
+            "buildconfiguration.cpp", "buildconfiguration.h",
+            "buildconfigurationmodel.cpp", "buildconfigurationmodel.h",
+            "buildenvironmentwidget.cpp", "buildenvironmentwidget.h",
+            "buildinfo.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",
+            "customparser.cpp", "customparser.h",
+            "customparserconfigdialog.cpp", "customparserconfigdialog.h", "customparserconfigdialog.ui",
+            "customtoolchain.cpp", "customtoolchain.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",
+            "environmentaspect.cpp", "environmentaspect.h",
+            "environmentaspectwidget.cpp", "environmentaspectwidget.h",
+            "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",
+            "importwidget.cpp", "importwidget.h",
+            "ioutputparser.cpp", "ioutputparser.h",
+            "iprojectmanager.h",
+            "iprojectproperties.h",
+            "itaskhandler.h",
+            "kit.cpp", "kit.h",
+            "kitchooser.cpp", "kitchooser.h",
+            "kitconfigwidget.cpp", "kitconfigwidget.h",
+            "kitinformation.cpp", "kitinformation.h",
+            "kitinformationconfigwidget.cpp", "kitinformationconfigwidget.h",
+            "kitmanager.cpp", "kitmanager.h",
+            "kitmanagerconfigwidget.cpp", "kitmanagerconfigwidget.h",
+            "kitmodel.cpp", "kitmodel.h",
+            "kitoptionspage.cpp", "kitoptionspage.h",
+            "ldparser.cpp", "ldparser.h",
+            "linuxiccparser.cpp", "linuxiccparser.h",
+            "localapplicationrunconfiguration.cpp", "localapplicationrunconfiguration.h",
+            "localapplicationruncontrol.cpp", "localapplicationruncontrol.h",
+            "localenvironmentaspect.cpp", "localenvironmentaspect.h",
+            "metatypedeclarations.h",
+            "miniprojecttargetselector.cpp", "miniprojecttargetselector.h",
+            "namedwidget.cpp", "namedwidget.h",
+            "nodesvisitor.cpp", "nodesvisitor.h",
+            "osparser.cpp", "osparser.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",
+            "projectimporter.cpp", "projectimporter.h",
+            "projectmacroexpander.cpp", "projectmacroexpander.h",
+            "projectmodels.cpp", "projectmodels.h",
+            "projectnodes.cpp", "projectnodes.h",
+            "projecttreewidget.cpp", "projecttreewidget.h",
+            "projectwindow.cpp", "projectwindow.h",
+            "projectwizardpage.cpp", "projectwizardpage.h", "projectwizardpage.ui",
+            "removetaskhandler.cpp", "removetaskhandler.h",
+            "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",
+            "showoutputtaskhandler.cpp", "showoutputtaskhandler.h",
+            "target.cpp", "target.h",
+            "targetselector.cpp", "targetselector.h",
+            "targetsettingspanel.cpp", "targetsettingspanel.h",
+            "targetsettingswidget.cpp", "targetsettingswidget.h", "targetsettingswidget.ui",
+            "targetsetuppage.cpp", "targetsetuppage.h",
+            "targetsetupwidget.cpp", "targetsetupwidget.h",
+            "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.cpp", "toolchainmanager.h",
+            "toolchainoptionspage.cpp", "toolchainoptionspage.h",
+            "unconfiguredprojectpanel.cpp", "unconfiguredprojectpanel.h",
+            "vcsannotatetaskhandler.cpp", "vcsannotatetaskhandler.h",
+        ]
+    }
+
+    Group {
+        name: "Project Welcome Page"
+        condition: QtcFunctions.versionIsAtLeast(Qt.core.version, "5.1")
+        files: [
+            "projectwelcomepage.cpp",
+            "projectwelcomepage.h"
+        ]
+    }
+
+    Group {
+        name: "CustomWizard"
+        prefix: "customwizard/"
+        files: [
+            "customwizard.cpp", "customwizard.h",
+            "customwizardpage.cpp", "customwizardpage.h",
+            "customwizardparameters.cpp", "customwizardparameters.h",
+            "customwizardpreprocessor.cpp", "customwizardpreprocessor.h",
+            "customwizardscriptgenerator.cpp", "customwizardscriptgenerator.h"
+        ]
+    }
+
+    Group {
+        name: "Device Support"
+        prefix: "devicesupport/"
+        files: [
+            "desktopdevice.cpp", "desktopdevice.h",
+            "desktopdevicefactory.cpp", "desktopdevicefactory.h",
+            "deviceapplicationrunner.cpp", "deviceapplicationrunner.h",
+            "devicecheckbuildstep.cpp", "devicecheckbuildstep.h",
+            "devicefactoryselectiondialog.cpp", "devicefactoryselectiondialog.h", "devicefactoryselectiondialog.ui",
+            "devicemanager.cpp", "devicemanager.h",
+            "devicemanagermodel.cpp", "devicemanagermodel.h",
+            "deviceprocess.cpp", "deviceprocess.h",
+            "deviceprocessesdialog.cpp", "deviceprocessesdialog.h",
+            "deviceprocesslist.cpp", "deviceprocesslist.h",
+            "devicesettingspage.cpp", "devicesettingspage.h",
+            "devicesettingswidget.cpp", "devicesettingswidget.h", "devicesettingswidget.ui",
+            "devicetestdialog.cpp", "devicetestdialog.h", "devicetestdialog.ui",
+            "deviceusedportsgatherer.cpp", "deviceusedportsgatherer.h",
+            "idevice.cpp", "idevice.h",
+            "idevicefactory.cpp", "idevicefactory.h",
+            "idevicewidget.h",
+            "desktopdeviceprocess.cpp", "desktopdeviceprocess.h",
+            "localprocesslist.cpp", "localprocesslist.h",
+            "sshdeviceprocess.cpp", "sshdeviceprocess.h",
+            "sshdeviceprocesslist.cpp", "sshdeviceprocesslist.h",
+            "desktopprocesssignaloperation.cpp", "desktopprocesssignaloperation.h",
+            "desktopdeviceconfigurationwidget.cpp", "desktopdeviceconfigurationwidget.h", "desktopdeviceconfigurationwidget.ui"
+        ]
+    }
 
-    files: [
-        "abi.cpp",
-        "abi.h",
-        "abiwidget.cpp",
-        "abiwidget.h",
-        "abstractprocessstep.cpp",
-        "abstractprocessstep.h",
-        "allprojectsfilter.cpp",
-        "allprojectsfilter.h",
-        "allprojectsfind.cpp",
-        "allprojectsfind.h",
-        "ansifilterparser.cpp",
-        "ansifilterparser.h",
-        "applicationlauncher.cpp",
-        "applicationlauncher.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",
-        "customtoolchain.cpp",
-        "customtoolchain.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",
-        "environmentaspect.cpp",
-        "environmentaspect.h",
-        "environmentaspectwidget.cpp",
-        "environmentaspectwidget.h",
-        "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",
-        "ioutputparser.h",
-        "iprojectmanager.h",
-        "iprojectproperties.h",
-        "itaskhandler.h",
-        "kit.cpp",
-        "kit.h",
-        "kitchooser.cpp",
-        "kitchooser.h",
-        "kitconfigwidget.h",
-        "kitinformation.cpp",
-        "kitinformation.h",
-        "kitinformationconfigwidget.cpp",
-        "kitinformationconfigwidget.h",
-        "kitmanager.cpp",
-        "kitmanager.h",
-        "kitmanagerconfigwidget.cpp",
-        "kitmanagerconfigwidget.h",
-        "kitmodel.cpp",
-        "kitmodel.h",
-        "kitoptionspage.cpp",
-        "kitoptionspage.h",
-        "ldparser.cpp",
-        "ldparser.h",
-        "linuxiccparser.cpp",
-        "linuxiccparser.h",
-        "localapplicationrunconfiguration.cpp",
-        "localapplicationrunconfiguration.h",
-        "localapplicationruncontrol.cpp",
-        "localapplicationruncontrol.h",
-        "localenvironmentaspect.cpp",
-        "localenvironmentaspect.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",
-        "projectmacroexpander.cpp",
-        "projectmacroexpander.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",
-        "removetaskhandler.cpp",
-        "removetaskhandler.h",
-        "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",
-        "showoutputtaskhandler.cpp",
-        "showoutputtaskhandler.h",
-        "target.cpp",
-        "target.h",
-        "targetselector.cpp",
-        "targetselector.h",
-        "targetsettingspanel.cpp",
-        "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.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",
-        "devicesupport/desktopdevice.cpp",
-        "devicesupport/desktopdevice.h",
-        "devicesupport/desktopdevicefactory.cpp",
-        "devicesupport/desktopdevicefactory.h",
-        "devicesupport/deviceapplicationrunner.cpp",
-        "devicesupport/deviceapplicationrunner.h",
-        "devicesupport/devicecheckbuildstep.cpp",
-        "devicesupport/devicecheckbuildstep.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",
-        "devicesupport/desktopdeviceconfigurationwidget.cpp",
-        "devicesupport/desktopdeviceconfigurationwidget.h",
-        "devicesupport/desktopdeviceconfigurationwidget.ui",
-        "images/BuildSettings.png",
-        "images/CodeStyleSettings.png",
-        "images/Desktop.png",
-        "images/DeviceConnected.png",
-        "images/DeviceDisconnected.png",
-        "images/DeviceReadyToUse.png",
-        "images/EditorSettings.png",
-        "images/MaemoDevice.png",
-        "images/ProjectDependencies.png",
-        "images/RunSettings.png",
-        "images/Simulator.png",
-        "images/build.png",
-        "images/build_32.png",
-        "images/build_small.png",
-        "images/clean.png",
-        "images/clean_small.png",
-        "images/closetab.png",
-        "images/compile_error.png",
-        "images/compile_warning.png",
-        "images/debugger_start.png",
-        "images/debugger_start_small.png",
-        "images/findallprojects.png",
-        "images/findproject.png",
-        "images/leftselection.png",
-        "images/midselection.png",
-        "images/projectexplorer.png",
-        "images/rebuild.png",
-        "images/rebuild_small.png",
-        "images/rightselection.png",
-        "images/run.png",
-        "images/run_small.png",
-        "images/session.png",
-        "images/stop.png",
-        "images/stop_small.png",
-        "images/targetbuildselected.png",
-        "images/targetleftbutton.png",
-        "images/targetpanel_bottom.png",
-        "images/targetpanel_gradient.png",
-        "images/targetrightbutton.png",
-        "images/targetrunselected.png",
-        "images/targetseparatorbackground.png",
-        "images/targetunselected.png",
-        "images/window.png",
-        "publishing/ipublishingwizardfactory.h",
-        "publishing/publishingwizardselectiondialog.cpp",
-        "publishing/publishingwizardselectiondialog.h",
-        "publishing/publishingwizardselectiondialog.ui",
-    ]
+    Group {
+        name: "Images"
+        prefix: "images/"
+        files: [
+            "BuildSettings.png",
+            "CodeStyleSettings.png",
+            "Desktop.png",
+            "DeviceConnected.png",
+            "DeviceDisconnected.png",
+            "DeviceReadyToUse.png",
+            "EditorSettings.png",
+            "MaemoDevice.png",
+            "ProjectDependencies.png",
+            "RunSettings.png",
+            "Simulator.png",
+            "build.png",
+            "build_32.png",
+            "build_small.png",
+            "clean.png",
+            "clean_small.png",
+            "closetab.png",
+            "compile_error.png",
+            "compile_warning.png",
+            "debugger_start.png",
+            "debugger_start_small.png",
+            "findallprojects.png",
+            "findproject.png",
+            "leftselection.png",
+            "midselection.png",
+            "projectexplorer.png",
+            "rebuild.png",
+            "rebuild_small.png",
+            "rightselection.png",
+            "run.png",
+            "run_small.png",
+            "session.png",
+            "stop.png",
+            "stop_small.png",
+            "targetbuildselected.png",
+            "targetleftbutton.png",
+            "targetpanel_bottom.png",
+            "targetpanel_gradient.png",
+            "targetrightbutton.png",
+            "targetrunselected.png",
+            "targetseparatorbackground.png",
+            "targetunselected.png",
+            "window.png",
+        ]
+    }
+
+    Group {
+        name: "Publishing"
+        prefix: "publishing/"
+        files: [
+            "ipublishingwizardfactory.h",
+            "publishingwizardselectiondialog.cpp", "publishingwizardselectiondialog.h", "publishingwizardselectiondialog.ui",
+        ]
+    }
 
     Group {
         name: "WindowsToolChains"
-        condition: qbs.targetOS.contains("windows") || Defaults.testsEnabled(qbs)
+        condition: qbs.targetOS.contains("windows") || project.testsEnabled
         files: [
            "abstractmsvctoolchain.cpp",
            "abstractmsvctoolchain.h",
@@ -351,7 +273,7 @@ QtcPlugin {
 
     Group {
         name: "Tests"
-        condition: Defaults.testsEnabled(qbs)
+        condition: project.testsEnabled
         files: ["outputparser_test.h", "outputparser_test.cpp"]
     }