ProjectExplorer: Rename kitinformation.{h,cpp} to kitaspects.{h,cpp}

Change-Id: I069bddeb457366210d339edcbb8ffb359a40fab8
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>

src/plugins/android/androidconfigurations.cpp

@@ -15,7 +15,7 @@
 #include <coreplugin/messagemanager.h>
 
 #include <projectexplorer/devicesupport/devicemanager.h>
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/kitmanager.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorerconstants.h>

src/plugins/android/androiddevice.cpp

@@ -15,7 +15,7 @@
 
 #include <projectexplorer/devicesupport/devicemanager.h>
 #include <projectexplorer/devicesupport/idevicewidget.h>
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/runconfiguration.h>
 #include <projectexplorer/projectmanager.h>

src/plugins/android/androidmanifesteditorwidget.cpp

@@ -17,13 +17,13 @@
 #include <qtsupport/qtkitinformation.h>
 
 #include <projectexplorer/buildconfiguration.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/project.h>
-#include <projectexplorer/projectnodes.h>
+#include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectmanager.h>
+#include <projectexplorer/projectnodes.h>
 #include <projectexplorer/projectwindow.h>
 #include <projectexplorer/target.h>
-#include <projectexplorer/projectexplorer.h>
-#include <projectexplorer/kitinformation.h>
 
 #include <texteditor/texteditoractionhandler.h>
 #include <texteditor/texteditor.h>

src/plugins/android/androidpackageinstallationstep.cpp

@@ -9,14 +9,14 @@
 #include <projectexplorer/abstractprocessstep.h>
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/buildsteplist.h>
+#include <projectexplorer/buildsystem.h>
 #include <projectexplorer/gnumakeparser.h>
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/processparameters.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/target.h>
 #include <projectexplorer/taskhub.h>
 #include <projectexplorer/toolchain.h>
-#include <projectexplorer/buildsystem.h>
 
 #include <qtsupport/baseqtversion.h>
 #include <qtsupport/qtkitinformation.h>

src/plugins/android/androidplugin.cpp

@@ -41,7 +41,7 @@
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/deployconfiguration.h>
 #include <projectexplorer/devicesupport/devicemanager.h>
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/kitmanager.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectmanager.h>

src/plugins/android/androidpotentialkit.cpp

@@ -9,9 +9,9 @@
 #include <coreplugin/coreicons.h>
 #include <coreplugin/icore.h>
 
-#include <projectexplorer/kitmanager.h>
 #include <projectexplorer/kit.h>
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
+#include <projectexplorer/kitmanager.h>
 
 #include <qtsupport/qtversionmanager.h>
 #include <qtsupport/baseqtversion.h>

src/plugins/android/androidrunconfiguration.cpp

@@ -8,7 +8,7 @@
 #include "androidtr.h"
 
 #include <projectexplorer/buildsystem.h>
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/runconfigurationaspects.h>
 #include <projectexplorer/target.h>

src/plugins/android/javalanguageserver.cpp

@@ -10,7 +10,7 @@
 #include <languageclient/client.h>
 #include <languageclient/languageclientinterface.h>
 #include <languageclient/languageclientutils.h>
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectnodes.h>
 #include <projectexplorer/target.h>

src/plugins/autotest/autotestunittests.cpp

@@ -15,7 +15,7 @@
 
 #include <extensionsystem/pluginmanager.h>
 
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/kitmanager.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/toolchain.h>

src/plugins/autotest/testconfiguration.cpp

@@ -10,7 +10,7 @@
 #include <projectexplorer/buildsystem.h>
 #include <projectexplorer/buildtargetinfo.h>
 #include <projectexplorer/deploymentdata.h>
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/runconfiguration.h>
 #include <projectexplorer/projectmanager.h>
 #include <projectexplorer/target.h>

src/plugins/baremetal/baremetaldebugsupport.cpp

@@ -15,7 +15,7 @@
 
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/buildsteplist.h>
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/runconfiguration.h>

src/plugins/boot2qt/qdbdeployconfigurationfactory.cpp

@@ -8,7 +8,7 @@
 
 #include <projectexplorer/deploymentdataview.h>
 #include <projectexplorer/devicesupport/idevice.h>
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/target.h>

src/plugins/boot2qt/qdbplugin.cpp

@@ -20,7 +20,7 @@
 #include <coreplugin/icore.h>
 
 #include <projectexplorer/devicesupport/devicemanager.h>
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/kitmanager.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/target.h>

src/plugins/boot2qt/qdbrunconfiguration.cpp

@@ -10,7 +10,7 @@
 #include <projectexplorer/buildtargetinfo.h>
 #include <projectexplorer/deploymentdata.h>
 #include <projectexplorer/devicesupport/idevice.h>
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/runconfigurationaspects.h>
 #include <projectexplorer/target.h>

src/plugins/boot2qt/qdbstopapplicationstep.cpp

@@ -7,7 +7,7 @@
 #include "qdbtr.h"
 
 #include <projectexplorer/devicesupport/idevice.h>
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/target.h>
 

src/plugins/clangcodemodel/clangdclient.cpp

@@ -44,7 +44,7 @@
 #include <languageserverprotocol/progresssupport.h>
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/devicesupport/idevice.h>
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/projecttree.h>
 #include <projectexplorer/projectmanager.h>

src/plugins/clangcodemodel/clangutils.cpp

@@ -16,7 +16,7 @@
 #include <cppeditor/editordocumenthandle.h>
 #include <cppeditor/projectpart.h>
 #include <projectexplorer/buildconfiguration.h>
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/target.h>
 #include <texteditor/codeassist/textdocumentmanipulatorinterface.h>

src/plugins/clangtools/clangtool.cpp

@@ -27,7 +27,7 @@
 
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/buildmanager.h>
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/projectexplorericons.h>

src/plugins/clangtools/clangtoolsplugin.cpp

@@ -35,7 +35,7 @@
 
 #include <texteditor/texteditor.h>
 
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/projectpanelfactory.h>
 #include <projectexplorer/target.h>
 #include <projectexplorer/taskhub.h>

src/plugins/clangtools/clangtoolspreconfiguredsessiontests.cpp

@@ -12,7 +12,7 @@
 #include <cppeditor/compileroptionsbuilder.h>
 #include <cppeditor/projectinfo.h>
 
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/kitmanager.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorer.h>

src/plugins/clangtools/clangtoolsunittests.cpp

@@ -14,7 +14,7 @@
 #include <cppeditor/cpptoolsreuse.h>
 #include <cppeditor/cpptoolstestcase.h>
 
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/kitmanager.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectexplorerconstants.h>

src/plugins/cmakeprojectmanager/builddirparameters.cpp

@@ -8,7 +8,7 @@
 #include "cmakekitinformation.h"
 #include "cmaketoolmanager.h"
 
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/target.h>
 #include <projectexplorer/toolchain.h>

src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp

@@ -34,7 +34,7 @@
 #include <projectexplorer/devicesupport/idevice.h>
 #include <projectexplorer/environmentaspectwidget.h>
 #include <projectexplorer/environmentwidget.h>
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/namedwidget.h>
 #include <projectexplorer/processparameters.h>
 #include <projectexplorer/project.h>

src/plugins/cmakeprojectmanager/cmakebuildstep.cpp

@@ -23,7 +23,7 @@
 #include <projectexplorer/devicesupport/idevice.h>
 #include <projectexplorer/environmentwidget.h>
 #include <projectexplorer/gnumakeparser.h>
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/processparameters.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorer.h>

src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp

@@ -26,7 +26,7 @@
 #include <cppeditor/cppprojectupdater.h>
 
 #include <projectexplorer/extracompiler.h>
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/target.h>

src/plugins/cmakeprojectmanager/cmakekitinformation.cpp

@@ -15,7 +15,7 @@
 #include <ios/iosconstants.h>
 
 #include <projectexplorer/devicesupport/idevice.h>
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/projectexplorersettings.h>

src/plugins/cmakeprojectmanager/cmakeproject.cpp

@@ -12,7 +12,7 @@
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/buildinfo.h>
 #include <projectexplorer/buildsteplist.h>
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/projectnodes.h>
 #include <projectexplorer/target.h>

src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp

@@ -14,7 +14,7 @@
 #include <coreplugin/messagemanager.h>
 
 #include <projectexplorer/buildinfo.h>
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/target.h>
 #include <projectexplorer/toolchainmanager.h>

src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp

@@ -16,7 +16,7 @@
 #include <projectexplorer/deploymentdata.h>
 #include <projectexplorer/gcctoolchain.h>
 #include <projectexplorer/headerpath.h>
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/kitmanager.h>
 #include <projectexplorer/namedwidget.h>
 #include <projectexplorer/projectexplorerconstants.h>

src/plugins/compilationdatabaseprojectmanager/compilationdatabasetests.cpp

@@ -9,7 +9,7 @@
 #include <cppeditor/cpptoolstestcase.h>
 #include <cppeditor/projectinfo.h>
 
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/kitmanager.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectexplorerconstants.h>

src/plugins/conan/conaninstallstep.cpp

@@ -11,7 +11,7 @@
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/buildsteplist.h>
 #include <projectexplorer/gnumakeparser.h>
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/processparameters.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/project.h>

src/plugins/cppcheck/cppcheckplugin.cpp

@@ -13,7 +13,7 @@
 #include "cppcheckdiagnosticsmodel.h"
 #include "cppcheckmanualrundialog.h"
 
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectexplorerconstants.h>

src/plugins/cppeditor/cppmodelmanager.cpp

@@ -48,7 +48,7 @@
 
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/gcctoolchain.h>
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/kitmanager.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorer.h>

src/plugins/cppeditor/projectinfo.cpp

@@ -4,7 +4,7 @@
 #include "projectinfo.h"
 
 #include <projectexplorer/abi.h>
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/rawprojectpart.h>
 #include <projectexplorer/toolchain.h>

src/plugins/debugger/analyzer/startremotedialog.cpp

@@ -9,8 +9,8 @@
 
 #include <projectexplorer/devicesupport/idevice.h>
 #include <projectexplorer/devicesupport/sshparameters.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/kitchooser.h>
-#include <projectexplorer/kitinformation.h>
 
 #include <utils/commandline.h>
 

src/plugins/debugger/debuggerdialogs.cpp

@@ -10,7 +10,7 @@
 #include <coreplugin/icore.h>
 
 #include <projectexplorer/devicesupport/sshparameters.h>
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/kitmanager.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/toolchain.h>

src/plugins/debugger/debuggerkitinformation.h

@@ -6,7 +6,7 @@
 #include "debugger_global.h"
 #include "debuggerconstants.h"
 
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/runconfiguration.h>
 
 namespace Debugger {

src/plugins/debugger/debuggerrunconfigurationaspect.cpp

@@ -14,7 +14,7 @@
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/buildstep.h>
 #include <projectexplorer/buildsteplist.h>
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/runconfiguration.h>

src/plugins/docker/dockerdevice.cpp

@@ -18,7 +18,7 @@
 #include <projectexplorer/devicesupport/devicemanager.h>
 #include <projectexplorer/devicesupport/idevicewidget.h>
 #include <projectexplorer/devicesupport/processlist.h>
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/kitmanager.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorertr.h>

src/plugins/genericprojectmanager/genericproject.cpp

@@ -24,7 +24,7 @@
 #include <projectexplorer/customexecutablerunconfiguration.h>
 #include <projectexplorer/deploymentdata.h>
 #include <projectexplorer/headerpath.h>
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/projectnodes.h>
 #include <projectexplorer/selectablefilesmodel.h>

src/plugins/incredibuild/makecommandbuilder.cpp

@@ -7,11 +7,11 @@
 
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/buildstep.h>
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
+#include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/target.h>
 #include <projectexplorer/toolchain.h>
-#include <projectexplorer/project.h>
 
 #include <qmakeprojectmanager/qmakeprojectmanagerconstants.h> // Compile-time only
 

src/plugins/ios/iosbuildconfiguration.cpp

@@ -7,7 +7,7 @@
 #include "iosconstants.h"
 #include "iostr.h"
 
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/namedwidget.h>
 #include <projectexplorer/target.h>
 

src/plugins/ios/iosbuildstep.cpp

@@ -11,7 +11,7 @@
 #include <projectexplorer/buildsteplist.h>
 #include <projectexplorer/gcctoolchain.h>
 #include <projectexplorer/gnumakeparser.h>
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/processparameters.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorer.h>

src/plugins/ios/iosconfigurations.cpp

@@ -12,8 +12,8 @@
 
 #include <coreplugin/icore.h>
 
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/kitmanager.h>
-#include <projectexplorer/kitinformation.h>
 #include <projectexplorer/devicesupport/devicemanager.h>
 #include <projectexplorer/devicesupport/idevice.h>
 #include <projectexplorer/toolchainmanager.h>

src/plugins/ios/iosdeploystep.cpp

@@ -14,8 +14,8 @@
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/target.h>
 #include <projectexplorer/taskhub.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/kitmanager.h>
-#include <projectexplorer/kitinformation.h>
 #include <projectexplorer/devicesupport/devicemanager.h>
 
 #include <solutions/tasking/tasktree.h>

src/plugins/ios/iosdevice.cpp

@@ -13,7 +13,7 @@
 
 #include <projectexplorer/devicesupport/devicemanager.h>
 #include <projectexplorer/devicesupport/idevicewidget.h>
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 
 #include <utils/portlist.h>
 

src/plugins/ios/iosdsymbuildstep.cpp

@@ -12,7 +12,7 @@
 
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/buildsteplist.h>
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/processparameters.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorer.h>

src/plugins/ios/iosrunconfiguration.cpp

@@ -13,7 +13,7 @@
 #include <projectexplorer/buildsteplist.h>
 #include <projectexplorer/deployconfiguration.h>
 #include <projectexplorer/devicesupport/devicemanager.h>
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectnodes.h>
 #include <projectexplorer/runconfigurationaspects.h>

src/plugins/ios/iosrunner.cpp

@@ -16,7 +16,7 @@
 #include <debugger/debuggerplugin.h>
 #include <debugger/debuggerruncontrol.h>
 
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/runconfigurationaspects.h>
 #include <projectexplorer/target.h>

src/plugins/ios/iossimulator.cpp

@@ -5,7 +5,7 @@
 #include "iosconstants.h"
 #include "iostr.h"
 
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 
 #include <utils/port.h>
 #include <utils/process.h>

src/plugins/mcusupport/mcukitinformation.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 
 namespace McuSupport {
 namespace Internal {

src/plugins/mcusupport/test/unittest.cpp

@@ -38,7 +38,7 @@
 #include <gmock/gmock.h>
 
 #include <projectexplorer/customtoolchain.h>
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/toolchain.h>

src/plugins/mesonprojectmanager/kithelper.h

@@ -7,7 +7,7 @@
 #include "versionhelper.h"
 
 #include <projectexplorer/kit.h>
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 
 #include <utils/macroexpander.h>
 #include <utils/qtcassert.h>

src/plugins/mesonprojectmanager/mesonbuildsystem.cpp

@@ -13,7 +13,7 @@
 #include <coreplugin/icore.h>
 
 #include <projectexplorer/buildconfiguration.h>
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/kitmanager.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/taskhub.h>

src/plugins/mesonprojectmanager/mesonproject.cpp

@@ -10,7 +10,7 @@
 
 #include <coreplugin/icontext.h>
 
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/target.h>
 

src/plugins/nim/project/nimbuildsystem.cpp

@@ -6,9 +6,9 @@
 #include "nimconstants.h"
 #include "nimbleproject.h"
 
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/target.h>
 #include <projectexplorer/toolchain.h>
-#include <projectexplorer/kitinformation.h>
 
 #include <utils/algorithm.h>
 #include <utils/fileutils.h>

src/plugins/nim/project/nimcompilerbuildstep.cpp

@@ -10,7 +10,7 @@
 
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/ioutputparser.h>
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/processparameters.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorerconstants.h>

src/plugins/nim/project/nimproject.cpp

@@ -9,7 +9,7 @@
 
 #include <coreplugin/icontext.h>
 
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/projectmanager.h>
 #include <projectexplorer/toolchain.h>

src/plugins/perfprofiler/perfdatareader.cpp

@@ -15,10 +15,10 @@
 #include <coreplugin/progressmanager/progressmanager.h>
 
 #include <projectexplorer/buildconfiguration.h>
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/project.h>
-#include <projectexplorer/runcontrol.h>
 #include <projectexplorer/projectmanager.h>
+#include <projectexplorer/runcontrol.h>
 #include <projectexplorer/target.h>
 #include <projectexplorer/toolchain.h>
 

src/plugins/perfprofiler/perfprofilerruncontrol.cpp

@@ -13,7 +13,7 @@
 #include <coreplugin/messagemanager.h>
 
 #include <projectexplorer/devicesupport/idevice.h>
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/target.h>
 

src/plugins/perfprofiler/perfprofilertool.cpp

@@ -21,12 +21,12 @@
 #include <debugger/analyzer/analyzermanager.h>
 #include <debugger/debuggericons.h>
 
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectexplorerconstants.h>
-#include <projectexplorer/runcontrol.h>
 #include <projectexplorer/projectmanager.h>
+#include <projectexplorer/runcontrol.h>
 #include <projectexplorer/target.h>
 
 #include <qtsupport/qtkitinformation.h>

src/plugins/perfprofiler/perfsettings.cpp

@@ -16,7 +16,7 @@
 
 #include <projectexplorer/devicesupport/idevice.h>
 #include <projectexplorer/kit.h>
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/target.h>
 
 #include <utils/aspects.h>

src/plugins/perfprofiler/perftracepointdialog.cpp

@@ -5,7 +5,7 @@
 #include "perftracepointdialog.h"
 
 #include <projectexplorer/devicesupport/devicemanager.h>
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/projectmanager.h>

src/plugins/projectexplorer/CMakeLists.txt

@@ -103,9 +103,9 @@ add_qtc_plugin(ProjectExplorer
     jsonwizard/wizarddebug.h
     jsonwizard/jsonwizardscannergenerator.cpp jsonwizard/jsonwizardscannergenerator.h
     kit.cpp kit.h
+    kitaspects.cpp kitaspects.h
     kitchooser.cpp kitchooser.h
     kitfeatureprovider.h
-    kitinformation.cpp kitinformation.h
     kitmanager.cpp kitmanager.h
     kitmanagerconfigwidget.cpp kitmanagerconfigwidget.h
     kitmodel.cpp kitmodel.h

src/plugins/projectexplorer/buildaspects.cpp

@@ -6,7 +6,7 @@
 #include "buildconfiguration.h"
 #include "buildpropertiessettings.h"
 #include "devicesupport/idevice.h"
-#include "kitinformation.h"
+#include "kitaspects.h"
 #include "projectexplorerconstants.h"
 #include "projectexplorertr.h"
 #include "target.h"

src/plugins/projectexplorer/buildconfiguration.cpp

@@ -12,7 +12,7 @@
 #include "customparser.h"
 #include "environmentwidget.h"
 #include "kit.h"
-#include "kitinformation.h"
+#include "kitaspects.h"
 #include "namedwidget.h"
 #include "projectexplorerconstants.h"
 #include "projectexplorer.h"

src/plugins/projectexplorer/buildmanager.cpp

@@ -10,7 +10,7 @@
 #include "deployconfiguration.h"
 #include "devicesupport/devicemanager.h"
 #include "kit.h"
-#include "kitinformation.h"
+#include "kitaspects.h"
 #include "project.h"
 #include "projectexplorer.h"
 #include "projectexplorerconstants.h"

src/plugins/projectexplorer/buildstep.cpp

@@ -7,7 +7,7 @@
 #include "buildsteplist.h"
 #include "customparser.h"
 #include "deployconfiguration.h"
-#include "kitinformation.h"
+#include "kitaspects.h"
 #include "project.h"
 #include "projectexplorerconstants.h"
 #include "sanitizerparser.h"

src/plugins/projectexplorer/deployconfiguration.cpp

@@ -5,7 +5,7 @@
 
 #include "buildsteplist.h"
 #include "deploymentdataview.h"
-#include "kitinformation.h"
+#include "kitaspects.h"
 #include "project.h"
 #include "projectexplorerconstants.h"
 #include "projectexplorertr.h"

src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.cpp

@@ -3,7 +3,7 @@
 
 #include "devicecheckbuildstep.h"
 
-#include "../kitinformation.h"
+#include "../kitaspects.h"
 #include "../projectexplorerconstants.h"
 #include "../projectexplorertr.h"
 

src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.cpp

@@ -5,8 +5,8 @@
 
 #include "idevice.h"
 #include "processlist.h"
+#include "../kitaspects.h"
 #include "../kitchooser.h"
-#include "../kitinformation.h"
 #include "../projectexplorertr.h"
 
 #include <utils/fancylineedit.h>

src/plugins/projectexplorer/devicesupport/idevice.cpp

@@ -9,7 +9,7 @@
 #include "sshparameters.h"
 
 #include "../kit.h"
-#include "../kitinformation.h"
+#include "../kitaspects.h"
 #include "../projectexplorertr.h"
 #include "../target.h"
 

src/plugins/projectexplorer/extracompiler.cpp

@@ -4,7 +4,7 @@
 #include "extracompiler.h"
 
 #include "buildmanager.h"
-#include "kitinformation.h"
+#include "kitaspects.h"
 #include "projectmanager.h"
 #include "target.h"
 

src/plugins/projectexplorer/kit.cpp

@@ -5,7 +5,7 @@
 
 #include "devicesupport/idevice.h"
 #include "devicesupport/idevicefactory.h"
-#include "kitinformation.h"
+#include "kitaspects.h"
 #include "kitmanager.h"
 #include "ioutputparser.h"
 #include "osparser.h"

src/plugins/projectexplorer/kitaspects.cpp

@@ -1,7 +1,7 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-#include "kitinformation.h"
+#include "kitaspects.h"
 
 #include "abi.h"
 #include "devicesupport/devicemanager.h"

src/plugins/projectexplorer/kitmanager.cpp

@@ -7,7 +7,7 @@
 #include "devicesupport/idevicefactory.h"
 #include "kit.h"
 #include "kitfeatureprovider.h"
-#include "kitinformation.h"
+#include "kitaspects.h"
 #include "projectexplorerconstants.h"
 #include "projectexplorertr.h"
 #include "toolchainmanager.h"

src/plugins/projectexplorer/kitmanagerconfigwidget.cpp

@@ -5,7 +5,7 @@
 
 #include "devicesupport/idevicefactory.h"
 #include "kit.h"
-#include "kitinformation.h"
+#include "kitaspects.h"
 #include "kitmanager.h"
 #include "projectexplorertr.h"
 #include "task.h"

src/plugins/projectexplorer/makestep.cpp

@@ -6,7 +6,7 @@
 #include "buildconfiguration.h"
 #include "devicesupport/idevice.h"
 #include "gnumakeparser.h"
-#include "kitinformation.h"
+#include "kitaspects.h"
 #include "processparameters.h"
 #include "projectexplorer.h"
 #include "projectexplorerconstants.h"

src/plugins/projectexplorer/parseissuesdialog.cpp

@@ -4,7 +4,7 @@
 #include "parseissuesdialog.h"
 
 #include "ioutputparser.h"
-#include "kitinformation.h"
+#include "kitaspects.h"
 #include "kitchooser.h"
 #include "kitmanager.h"
 #include "projectexplorerconstants.h"

src/plugins/projectexplorer/project.cpp

@@ -10,7 +10,7 @@
 #include "editorconfiguration.h"
 #include "environmentaspect.h"
 #include "kit.h"
-#include "kitinformation.h"
+#include "kitaspects.h"
 #include "msvctoolchain.h"
 #include "projectexplorer.h"
 #include "projectexplorerconstants.h"

src/plugins/projectexplorer/projectexplorer.cpp

@@ -47,7 +47,7 @@
 #include "jsonwizard/jsonwizardgeneratorfactory.h"
 #include "jsonwizard/jsonwizardpagefactory_p.h"
 #include "kitfeatureprovider.h"
-#include "kitinformation.h"
+#include "kitaspects.h"
 #include "kitmanager.h"
 #include "kitoptionspage.h"
 #include "miniprojecttargetselector.h"

src/plugins/projectexplorer/projectexplorer.qbs

@@ -81,9 +81,9 @@ Project {
                 "ipotentialkit.h",
                 "itaskhandler.h",
                 "kit.cpp", "kit.h",
+                "kitaspects.cpp", "kitaspects.h",
                 "kitchooser.cpp", "kitchooser.h",
                 "kitfeatureprovider.h",
-                "kitinformation.cpp", "kitinformation.h",
                 "kitmanager.cpp", "kitmanager.h",
                 "kitmanagerconfigwidget.cpp", "kitmanagerconfigwidget.h",
                 "kitmodel.cpp", "kitmodel.h",

src/plugins/projectexplorer/projectimporter.cpp

@@ -5,7 +5,7 @@
 
 #include "buildinfo.h"
 #include "kit.h"
-#include "kitinformation.h"
+#include "kitaspects.h"
 #include "kitmanager.h"
 #include "projectexplorerconstants.h"
 #include "projectexplorertr.h"

src/plugins/projectexplorer/rawprojectpart.cpp

@@ -6,7 +6,7 @@
 #include "abi.h"
 #include "buildconfiguration.h"
 #include "buildsystem.h"
-#include "kitinformation.h"
+#include "kitaspects.h"
 #include "project.h"
 #include "target.h"
 

src/plugins/projectexplorer/runconfiguration.cpp

@@ -6,8 +6,7 @@
 #include "buildconfiguration.h"
 #include "buildsystem.h"
 #include "environmentaspect.h"
-#include "kitinformation.h"
-#include "kitinformation.h"
+#include "kitaspects.h"
 #include "project.h"
 #include "projectexplorer.h"
 #include "projectexplorerconstants.h"

src/plugins/projectexplorer/runconfigurationaspects.cpp

@@ -6,7 +6,7 @@
 #include "devicesupport/devicemanager.h"
 #include "devicesupport/idevice.h"
 #include "environmentaspect.h"
-#include "kitinformation.h"
+#include "kitaspects.h"
 #include "projectexplorer.h"
 #include "projectexplorersettings.h"
 #include "projectexplorertr.h"

src/plugins/projectexplorer/runcontrol.cpp

@@ -9,7 +9,7 @@
 #include "devicesupport/idevice.h"
 #include "devicesupport/idevicefactory.h"
 #include "devicesupport/sshsettings.h"
-#include "kitinformation.h"
+#include "kitaspects.h"
 #include "project.h"
 #include "projectexplorer.h"
 #include "projectexplorerconstants.h"

src/plugins/projectexplorer/target.cpp

@@ -12,7 +12,7 @@
 #include "deploymentdata.h"
 #include "devicesupport/devicemanager.h"
 #include "kit.h"
-#include "kitinformation.h"
+#include "kitaspects.h"
 #include "kitmanager.h"
 #include "miniprojecttargetselector.h"
 #include "project.h"

src/plugins/python/pythonrunconfiguration.cpp

@@ -23,7 +23,7 @@
 #include <projectexplorer/buildsteplist.h>
 #include <projectexplorer/buildsystem.h>
 #include <projectexplorer/devicesupport/idevice.h>
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/runconfigurationaspects.h>
 #include <projectexplorer/target.h>
 #include <projectexplorer/taskhub.h>

src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp

@@ -13,7 +13,7 @@
 #include <projectexplorer/devicesupport/idevice.h>
 #include <projectexplorer/gcctoolchain.h>
 #include <projectexplorer/kit.h>
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/toolchain.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/msvctoolchain.h>

src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp

@@ -15,7 +15,7 @@
 #include <projectexplorer/buildsteplist.h>
 #include <projectexplorer/deployconfiguration.h>
 #include <projectexplorer/kit.h>
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/projectexplorertr.h>

src/plugins/qbsprojectmanager/qbskitinformation.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 
 namespace QbsProjectManager {
 namespace Internal {

src/plugins/qbsprojectmanager/qbsproject.cpp

@@ -35,7 +35,7 @@
 #include <projectexplorer/deploymentdata.h>
 #include <projectexplorer/headerpath.h>
 #include <projectexplorer/kit.h>
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/target.h>

src/plugins/qbsprojectmanager/qbsprojectimporter.cpp

@@ -10,7 +10,7 @@
 #include <coreplugin/documentmanager.h>
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/buildinfo.h>
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/kitmanager.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorer.h>

src/plugins/qmakeprojectmanager/qmakemakestep.cpp

@@ -12,14 +12,14 @@
 #include "qmakesettings.h"
 #include "qmakestep.h"
 
-#include <projectexplorer/target.h>
-#include <projectexplorer/toolchain.h>
 #include <projectexplorer/buildsteplist.h>
 #include <projectexplorer/gnumakeparser.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/processparameters.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectexplorerconstants.h>
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/target.h>
+#include <projectexplorer/toolchain.h>
 #include <projectexplorer/xcodebuildparser.h>
 
 #include <utils/process.h>

src/plugins/qmakeprojectmanager/wizards/qtwizard.cpp

@@ -12,7 +12,7 @@
 #include <cppeditor/cppeditorconstants.h>
 #include <cppeditor/cpptoolsreuse.h>
 
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/projecttree.h>

src/plugins/qmldesigner/qmlpreviewplugin/qmlpreviewactions.cpp

@@ -10,7 +10,7 @@
 
 #include <utils/utilsicons.h>
 
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/projectmanager.h>

src/plugins/qmlpreview/qmlpreviewfileontargetfinder.cpp

@@ -4,7 +4,7 @@
 #include "qmlpreviewfileontargetfinder.h"
 
 #include <projectexplorer/deploymentdata.h>
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/projectnodes.h>

src/plugins/qmlpreview/qmlpreviewplugin.cpp

@@ -21,7 +21,7 @@
 #include <extensionsystem/pluginmanager.h>
 
 #include <projectexplorer/kit.h>
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectexplorerconstants.h>