diff options
| author | hjk <[email protected]> | 2023-08-11 09:18:56 +0200 |
|---|---|---|
| committer | hjk <[email protected]> | 2023-08-15 07:31:03 +0000 |
| commit | 017d7c0e47393be4e420015199b82f4f22d6c53b (patch) | |
| tree | ecb9fe7480e907b10aca374518c00940c080a02f /src | |
| parent | 9a69c20c40ab9873f90bb60aab08b07f2ce3b806 (diff) | |
ProjectExplorer: Rename kitinformation.{h,cpp} to kitaspects.{h,cpp}
Change-Id: I069bddeb457366210d339edcbb8ffb359a40fab8
Reviewed-by: Jarek Kobus <[email protected]>
Diffstat (limited to 'src')
122 files changed, 135 insertions, 136 deletions
diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index 3ef93640c0d..0a1e9d60ff8 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/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> diff --git a/src/plugins/android/androiddevice.cpp b/src/plugins/android/androiddevice.cpp index 6a6ffcd5c1b..a74e94272e1 100644 --- a/src/plugins/android/androiddevice.cpp +++ b/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> diff --git a/src/plugins/android/androidmanifesteditorwidget.cpp b/src/plugins/android/androidmanifesteditorwidget.cpp index 36135f55713..1e932b4413d 100644 --- a/src/plugins/android/androidmanifesteditorwidget.cpp +++ b/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> diff --git a/src/plugins/android/androidpackageinstallationstep.cpp b/src/plugins/android/androidpackageinstallationstep.cpp index eaa8dc84162..e26e2ec009d 100644 --- a/src/plugins/android/androidpackageinstallationstep.cpp +++ b/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> diff --git a/src/plugins/android/androidplugin.cpp b/src/plugins/android/androidplugin.cpp index 916600c1df7..82a1bbfca0f 100644 --- a/src/plugins/android/androidplugin.cpp +++ b/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> diff --git a/src/plugins/android/androidpotentialkit.cpp b/src/plugins/android/androidpotentialkit.cpp index 0529df10e1e..08089d5f7f3 100644 --- a/src/plugins/android/androidpotentialkit.cpp +++ b/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> diff --git a/src/plugins/android/androidrunconfiguration.cpp b/src/plugins/android/androidrunconfiguration.cpp index 28d9862a70c..f8fb1b16487 100644 --- a/src/plugins/android/androidrunconfiguration.cpp +++ b/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> diff --git a/src/plugins/android/javalanguageserver.cpp b/src/plugins/android/javalanguageserver.cpp index 977b3fc61a9..b36f8f861dc 100644 --- a/src/plugins/android/javalanguageserver.cpp +++ b/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> diff --git a/src/plugins/autotest/autotestunittests.cpp b/src/plugins/autotest/autotestunittests.cpp index 7ed1a097d48..b036570d6e8 100644 --- a/src/plugins/autotest/autotestunittests.cpp +++ b/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> diff --git a/src/plugins/autotest/testconfiguration.cpp b/src/plugins/autotest/testconfiguration.cpp index 5f225db1972..0f948adff5a 100644 --- a/src/plugins/autotest/testconfiguration.cpp +++ b/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> diff --git a/src/plugins/baremetal/baremetaldebugsupport.cpp b/src/plugins/baremetal/baremetaldebugsupport.cpp index 4475be0b964..113e784dd14 100644 --- a/src/plugins/baremetal/baremetaldebugsupport.cpp +++ b/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> diff --git a/src/plugins/boot2qt/qdbdeployconfigurationfactory.cpp b/src/plugins/boot2qt/qdbdeployconfigurationfactory.cpp index eb5a180500e..b5a58792985 100644 --- a/src/plugins/boot2qt/qdbdeployconfigurationfactory.cpp +++ b/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> diff --git a/src/plugins/boot2qt/qdbplugin.cpp b/src/plugins/boot2qt/qdbplugin.cpp index 8c806cb158f..4d0eef65acf 100644 --- a/src/plugins/boot2qt/qdbplugin.cpp +++ b/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> diff --git a/src/plugins/boot2qt/qdbrunconfiguration.cpp b/src/plugins/boot2qt/qdbrunconfiguration.cpp index 976483faf9b..55d84445f40 100644 --- a/src/plugins/boot2qt/qdbrunconfiguration.cpp +++ b/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> diff --git a/src/plugins/boot2qt/qdbstopapplicationstep.cpp b/src/plugins/boot2qt/qdbstopapplicationstep.cpp index ea69b6ac1d5..4a51f843904 100644 --- a/src/plugins/boot2qt/qdbstopapplicationstep.cpp +++ b/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> diff --git a/src/plugins/clangcodemodel/clangdclient.cpp b/src/plugins/clangcodemodel/clangdclient.cpp index c7edf2b8b58..43db68c24b7 100644 --- a/src/plugins/clangcodemodel/clangdclient.cpp +++ b/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> diff --git a/src/plugins/clangcodemodel/clangutils.cpp b/src/plugins/clangcodemodel/clangutils.cpp index d5d7868137b..ce9f09126a6 100644 --- a/src/plugins/clangcodemodel/clangutils.cpp +++ b/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> diff --git a/src/plugins/clangtools/clangtool.cpp b/src/plugins/clangtools/clangtool.cpp index 493bd4e41d1..8c1b12c557f 100644 --- a/src/plugins/clangtools/clangtool.cpp +++ b/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> diff --git a/src/plugins/clangtools/clangtoolsplugin.cpp b/src/plugins/clangtools/clangtoolsplugin.cpp index dda49864eff..5f4ed2654c2 100644 --- a/src/plugins/clangtools/clangtoolsplugin.cpp +++ b/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> diff --git a/src/plugins/clangtools/clangtoolspreconfiguredsessiontests.cpp b/src/plugins/clangtools/clangtoolspreconfiguredsessiontests.cpp index 4c858451fa3..ce5c7a52549 100644 --- a/src/plugins/clangtools/clangtoolspreconfiguredsessiontests.cpp +++ b/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> diff --git a/src/plugins/clangtools/clangtoolsunittests.cpp b/src/plugins/clangtools/clangtoolsunittests.cpp index 34ecf11e9a8..0148f67c0d8 100644 --- a/src/plugins/clangtools/clangtoolsunittests.cpp +++ b/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> diff --git a/src/plugins/cmakeprojectmanager/builddirparameters.cpp b/src/plugins/cmakeprojectmanager/builddirparameters.cpp index fe4c63af3f7..75be66533f8 100644 --- a/src/plugins/cmakeprojectmanager/builddirparameters.cpp +++ b/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> diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp index 25acfcb0fec..a6ce7499249 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp +++ b/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> diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp index c9fd39d71d1..c0cfffbb233 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp +++ b/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> diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp index 8e693ba331c..113388cc507 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp +++ b/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> diff --git a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp index 436c225a5db..9085cff2dd8 100644 --- a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp +++ b/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> diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp index 44ebaff555e..95dd9d4f135 100644 --- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp +++ b/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> diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp index a005bd79fa7..45a7df0a116 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp +++ b/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> diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp index ad614e7e23a..37c0d29d8d6 100644 --- a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp +++ b/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> diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdatabasetests.cpp b/src/plugins/compilationdatabaseprojectmanager/compilationdatabasetests.cpp index f8b25747716..96b7e423d42 100644 --- a/src/plugins/compilationdatabaseprojectmanager/compilationdatabasetests.cpp +++ b/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> diff --git a/src/plugins/conan/conaninstallstep.cpp b/src/plugins/conan/conaninstallstep.cpp index 839261304d0..0a1182eced2 100644 --- a/src/plugins/conan/conaninstallstep.cpp +++ b/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> diff --git a/src/plugins/cppcheck/cppcheckplugin.cpp b/src/plugins/cppcheck/cppcheckplugin.cpp index 8f80707a240..44381c235ee 100644 --- a/src/plugins/cppcheck/cppcheckplugin.cpp +++ b/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> diff --git a/src/plugins/cppeditor/cppmodelmanager.cpp b/src/plugins/cppeditor/cppmodelmanager.cpp index d24a30d226c..a2f93635fea 100644 --- a/src/plugins/cppeditor/cppmodelmanager.cpp +++ b/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> diff --git a/src/plugins/cppeditor/projectinfo.cpp b/src/plugins/cppeditor/projectinfo.cpp index 3e1f5154e12..d7b0b58a7a1 100644 --- a/src/plugins/cppeditor/projectinfo.cpp +++ b/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> diff --git a/src/plugins/debugger/analyzer/startremotedialog.cpp b/src/plugins/debugger/analyzer/startremotedialog.cpp index 44447ad7017..f5e6fad3fe2 100644 --- a/src/plugins/debugger/analyzer/startremotedialog.cpp +++ b/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> diff --git a/src/plugins/debugger/debuggerdialogs.cpp b/src/plugins/debugger/debuggerdialogs.cpp index 9ddd7fa6f73..a6b38c479db 100644 --- a/src/plugins/debugger/debuggerdialogs.cpp +++ b/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> diff --git a/src/plugins/debugger/debuggerkitinformation.h b/src/plugins/debugger/debuggerkitinformation.h index 22379a332be..c6f8add9254 100644 --- a/src/plugins/debugger/debuggerkitinformation.h +++ b/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 { diff --git a/src/plugins/debugger/debuggerrunconfigurationaspect.cpp b/src/plugins/debugger/debuggerrunconfigurationaspect.cpp index cc1c0b855c1..78ea55f2a19 100644 --- a/src/plugins/debugger/debuggerrunconfigurationaspect.cpp +++ b/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> diff --git a/src/plugins/docker/dockerdevice.cpp b/src/plugins/docker/dockerdevice.cpp index c25f9458dae..484c9857dad 100644 --- a/src/plugins/docker/dockerdevice.cpp +++ b/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> diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp index 6a718e92a44..edfed66d477 100644 --- a/src/plugins/genericprojectmanager/genericproject.cpp +++ b/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> diff --git a/src/plugins/incredibuild/makecommandbuilder.cpp b/src/plugins/incredibuild/makecommandbuilder.cpp index f5baa68a46a..0d5caa548ec 100644 --- a/src/plugins/incredibuild/makecommandbuilder.cpp +++ b/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 diff --git a/src/plugins/ios/iosbuildconfiguration.cpp b/src/plugins/ios/iosbuildconfiguration.cpp index 93838793d93..1254115d666 100644 --- a/src/plugins/ios/iosbuildconfiguration.cpp +++ b/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> diff --git a/src/plugins/ios/iosbuildstep.cpp b/src/plugins/ios/iosbuildstep.cpp index bbc8d878101..c017c77408c 100644 --- a/src/plugins/ios/iosbuildstep.cpp +++ b/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> diff --git a/src/plugins/ios/iosconfigurations.cpp b/src/plugins/ios/iosconfigurations.cpp index 04e4363a2a1..fe2dcaf4227 100644 --- a/src/plugins/ios/iosconfigurations.cpp +++ b/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> diff --git a/src/plugins/ios/iosdeploystep.cpp b/src/plugins/ios/iosdeploystep.cpp index 3e86d9ec860..bd0dabc6f33 100644 --- a/src/plugins/ios/iosdeploystep.cpp +++ b/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> diff --git a/src/plugins/ios/iosdevice.cpp b/src/plugins/ios/iosdevice.cpp index 326092fccc3..b2cf10f5da3 100644 --- a/src/plugins/ios/iosdevice.cpp +++ b/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> diff --git a/src/plugins/ios/iosdsymbuildstep.cpp b/src/plugins/ios/iosdsymbuildstep.cpp index b7eb1f6abc1..d8dd96c5a92 100644 --- a/src/plugins/ios/iosdsymbuildstep.cpp +++ b/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> diff --git a/src/plugins/ios/iosrunconfiguration.cpp b/src/plugins/ios/iosrunconfiguration.cpp index 2012dfcc8f2..c0169af68b3 100644 --- a/src/plugins/ios/iosrunconfiguration.cpp +++ b/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> diff --git a/src/plugins/ios/iosrunner.cpp b/src/plugins/ios/iosrunner.cpp index 8237a19c43a..973185f041d 100644 --- a/src/plugins/ios/iosrunner.cpp +++ b/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> diff --git a/src/plugins/ios/iossimulator.cpp b/src/plugins/ios/iossimulator.cpp index fa68c4031e3..d646052126a 100644 --- a/src/plugins/ios/iossimulator.cpp +++ b/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> diff --git a/src/plugins/mcusupport/mcukitinformation.h b/src/plugins/mcusupport/mcukitinformation.h index 80a18e3c345..c138ba2fe6c 100644 --- a/src/plugins/mcusupport/mcukitinformation.h +++ b/src/plugins/mcusupport/mcukitinformation.h @@ -3,7 +3,7 @@ #pragma once -#include <projectexplorer/kitinformation.h> +#include <projectexplorer/kitaspects.h> namespace McuSupport { namespace Internal { diff --git a/src/plugins/mcusupport/test/unittest.cpp b/src/plugins/mcusupport/test/unittest.cpp index 697472c23fe..54933ca3da6 100644 --- a/src/plugins/mcusupport/test/unittest.cpp +++ b/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> diff --git a/src/plugins/mesonprojectmanager/kithelper.h b/src/plugins/mesonprojectmanager/kithelper.h index 00db098251a..f0d8c5be142 100644 --- a/src/plugins/mesonprojectmanager/kithelper.h +++ b/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> diff --git a/src/plugins/mesonprojectmanager/mesonbuildsystem.cpp b/src/plugins/mesonprojectmanager/mesonbuildsystem.cpp index f7a6ea59b8b..5bf33fea35b 100644 --- a/src/plugins/mesonprojectmanager/mesonbuildsystem.cpp +++ b/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> diff --git a/src/plugins/mesonprojectmanager/mesonproject.cpp b/src/plugins/mesonprojectmanager/mesonproject.cpp index 546347d459f..1566aa25533 100644 --- a/src/plugins/mesonprojectmanager/mesonproject.cpp +++ b/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> diff --git a/src/plugins/nim/project/nimbuildsystem.cpp b/src/plugins/nim/project/nimbuildsystem.cpp index 00d68034eb2..f07d8f607f3 100644 --- a/src/plugins/nim/project/nimbuildsystem.cpp +++ b/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> diff --git a/src/plugins/nim/project/nimcompilerbuildstep.cpp b/src/plugins/nim/project/nimcompilerbuildstep.cpp index 9e941e6893c..5b11856941a 100644 --- a/src/plugins/nim/project/nimcompilerbuildstep.cpp +++ b/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> diff --git a/src/plugins/nim/project/nimproject.cpp b/src/plugins/nim/project/nimproject.cpp index ed74cf43744..f7cf92fd064 100644 --- a/src/plugins/nim/project/nimproject.cpp +++ b/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> diff --git a/src/plugins/perfprofiler/perfdatareader.cpp b/src/plugins/perfprofiler/perfdatareader.cpp index a545dff913e..3ff74aaef20 100644 --- a/src/plugins/perfprofiler/perfdatareader.cpp +++ b/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> diff --git a/src/plugins/perfprofiler/perfprofilerruncontrol.cpp b/src/plugins/perfprofiler/perfprofilerruncontrol.cpp index 4368c713933..1919547383d 100644 --- a/src/plugins/perfprofiler/perfprofilerruncontrol.cpp +++ b/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> diff --git a/src/plugins/perfprofiler/perfprofilertool.cpp b/src/plugins/perfprofiler/perfprofilertool.cpp index 4d2ed0b05a5..102b4941b28 100644 --- a/src/plugins/perfprofiler/perfprofilertool.cpp +++ b/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> diff --git a/src/plugins/perfprofiler/perfsettings.cpp b/src/plugins/perfprofiler/perfsettings.cpp index 534af139615..84a8fdf736e 100644 --- a/src/plugins/perfprofiler/perfsettings.cpp +++ b/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> diff --git a/src/plugins/perfprofiler/perftracepointdialog.cpp b/src/plugins/perfprofiler/perftracepointdialog.cpp index 3920b526b89..d5cb2e16e3d 100644 --- a/src/plugins/perfprofiler/perftracepointdialog.cpp +++ b/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> diff --git a/src/plugins/projectexplorer/CMakeLists.txt b/src/plugins/projectexplorer/CMakeLists.txt index 63b511368c0..1d092e28fd4 100644 --- a/src/plugins/projectexplorer/CMakeLists.txt +++ b/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 diff --git a/src/plugins/projectexplorer/buildaspects.cpp b/src/plugins/projectexplorer/buildaspects.cpp index fe6f95b86ce..d44ba31dfa8 100644 --- a/src/plugins/projectexplorer/buildaspects.cpp +++ b/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" diff --git a/src/plugins/projectexplorer/buildconfiguration.cpp b/src/plugins/projectexplorer/buildconfiguration.cpp index 2d8afbd4fdb..234d4935085 100644 --- a/src/plugins/projectexplorer/buildconfiguration.cpp +++ b/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" diff --git a/src/plugins/projectexplorer/buildmanager.cpp b/src/plugins/projectexplorer/buildmanager.cpp index 38bc2e3bddc..596421b8f65 100644 --- a/src/plugins/projectexplorer/buildmanager.cpp +++ b/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" diff --git a/src/plugins/projectexplorer/buildstep.cpp b/src/plugins/projectexplorer/buildstep.cpp index 503d82d22e7..0f1ca94997a 100644 --- a/src/plugins/projectexplorer/buildstep.cpp +++ b/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" diff --git a/src/plugins/projectexplorer/deployconfiguration.cpp b/src/plugins/projectexplorer/deployconfiguration.cpp index a99bb447122..03761502d6e 100644 --- a/src/plugins/projectexplorer/deployconfiguration.cpp +++ b/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" diff --git a/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.cpp b/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.cpp index 9ccf0662d07..b01ecb47bc7 100644 --- a/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.cpp +++ b/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" diff --git a/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.cpp b/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.cpp index bd73abf0857..2c5acf105b2 100644 --- a/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.cpp +++ b/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> diff --git a/src/plugins/projectexplorer/devicesupport/idevice.cpp b/src/plugins/projectexplorer/devicesupport/idevice.cpp index 926bc31790a..cc55991e66a 100644 --- a/src/plugins/projectexplorer/devicesupport/idevice.cpp +++ b/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" diff --git a/src/plugins/projectexplorer/extracompiler.cpp b/src/plugins/projectexplorer/extracompiler.cpp index 1d0cb765685..a81ddda93fe 100644 --- a/src/plugins/projectexplorer/extracompiler.cpp +++ b/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" diff --git a/src/plugins/projectexplorer/kit.cpp b/src/plugins/projectexplorer/kit.cpp index 933fff2fb8f..20be63d68e9 100644 --- a/src/plugins/projectexplorer/kit.cpp +++ b/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" diff --git a/src/plugins/projectexplorer/kitinformation.cpp b/src/plugins/projectexplorer/kitaspects.cpp index 3b53e1893d4..9fa4abd502a 100644 --- a/src/plugins/projectexplorer/kitinformation.cpp +++ b/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" diff --git a/src/plugins/projectexplorer/kitinformation.h b/src/plugins/projectexplorer/kitaspects.h index 3acbcdf05ff..3acbcdf05ff 100644 --- a/src/plugins/projectexplorer/kitinformation.h +++ b/src/plugins/projectexplorer/kitaspects.h diff --git a/src/plugins/projectexplorer/kitmanager.cpp b/src/plugins/projectexplorer/kitmanager.cpp index 2da4794ca0b..433d9df9d48 100644 --- a/src/plugins/projectexplorer/kitmanager.cpp +++ b/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" diff --git a/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp b/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp index 9fca99b0948..97118f2bb27 100644 --- a/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp +++ b/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" diff --git a/src/plugins/projectexplorer/makestep.cpp b/src/plugins/projectexplorer/makestep.cpp index 6ec22628457..8f7f82da8f2 100644 --- a/src/plugins/projectexplorer/makestep.cpp +++ b/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" diff --git a/src/plugins/projectexplorer/parseissuesdialog.cpp b/src/plugins/projectexplorer/parseissuesdialog.cpp index 331773fe7b6..4abf2d3f988 100644 --- a/src/plugins/projectexplorer/parseissuesdialog.cpp +++ b/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" diff --git a/src/plugins/projectexplorer/project.cpp b/src/plugins/projectexplorer/project.cpp index 85a3850447d..fd91b4aaf55 100644 --- a/src/plugins/projectexplorer/project.cpp +++ b/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" diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index 636e4937b7f..e7d990a568e 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/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" diff --git a/src/plugins/projectexplorer/projectexplorer.qbs b/src/plugins/projectexplorer/projectexplorer.qbs index f398bb8b7cf..00dd2779ec3 100644 --- a/src/plugins/projectexplorer/projectexplorer.qbs +++ b/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", diff --git a/src/plugins/projectexplorer/projectimporter.cpp b/src/plugins/projectexplorer/projectimporter.cpp index 9c9b1f707a5..fec26598c33 100644 --- a/src/plugins/projectexplorer/projectimporter.cpp +++ b/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" diff --git a/src/plugins/projectexplorer/rawprojectpart.cpp b/src/plugins/projectexplorer/rawprojectpart.cpp index 81d4951ed0c..4ac7f3947a8 100644 --- a/src/plugins/projectexplorer/rawprojectpart.cpp +++ b/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" diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp index 365fb1673d6..64fafeea397 100644 --- a/src/plugins/projectexplorer/runconfiguration.cpp +++ b/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" diff --git a/src/plugins/projectexplorer/runconfigurationaspects.cpp b/src/plugins/projectexplorer/runconfigurationaspects.cpp index 806e387fdf8..7afe438ea6b 100644 --- a/src/plugins/projectexplorer/runconfigurationaspects.cpp +++ b/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" diff --git a/src/plugins/projectexplorer/runcontrol.cpp b/src/plugins/projectexplorer/runcontrol.cpp index 9b52213f065..a62a4b49b69 100644 --- a/src/plugins/projectexplorer/runcontrol.cpp +++ b/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" diff --git a/src/plugins/projectexplorer/target.cpp b/src/plugins/projectexplorer/target.cpp index 6f20ca8eaa3..deea1ef32ef 100644 --- a/src/plugins/projectexplorer/target.cpp +++ b/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" diff --git a/src/plugins/python/pythonrunconfiguration.cpp b/src/plugins/python/pythonrunconfiguration.cpp index 110b92a19e1..4675ef4b1bf 100644 --- a/src/plugins/python/pythonrunconfiguration.cpp +++ b/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> diff --git a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp index 24894105ee0..a2f425f32aa 100644 --- a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp +++ b/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> diff --git a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp index ad7ce2e1719..46044748a58 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp +++ b/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> diff --git a/src/plugins/qbsprojectmanager/qbskitinformation.h b/src/plugins/qbsprojectmanager/qbskitinformation.h index 34d3537e3b0..f454ed3a387 100644 --- a/src/plugins/qbsprojectmanager/qbskitinformation.h +++ b/src/plugins/qbsprojectmanager/qbskitinformation.h @@ -3,7 +3,7 @@ #pragma once -#include <projectexplorer/kitinformation.h> +#include <projectexplorer/kitaspects.h> namespace QbsProjectManager { namespace Internal { diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp index b0968da5a8a..bcca10081a6 100644 --- a/src/plugins/qbsprojectmanager/qbsproject.cpp +++ b/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> diff --git a/src/plugins/qbsprojectmanager/qbsprojectimporter.cpp b/src/plugins/qbsprojectmanager/qbsprojectimporter.cpp index 541cbbe5fb1..1d2cd4e4537 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectimporter.cpp +++ b/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> diff --git a/src/plugins/qmakeprojectmanager/qmakemakestep.cpp b/src/plugins/qmakeprojectmanager/qmakemakestep.cpp index b79f79b7a6c..617c0d63e80 100644 --- a/src/plugins/qmakeprojectmanager/qmakemakestep.cpp +++ b/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> diff --git a/src/plugins/qmakeprojectmanager/wizards/qtwizard.cpp b/src/plugins/qmakeprojectmanager/wizards/qtwizard.cpp index 16f533020db..d3d3c19b756 100644 --- a/src/plugins/qmakeprojectmanager/wizards/qtwizard.cpp +++ b/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> diff --git a/src/plugins/qmldesigner/qmlpreviewplugin/qmlpreviewactions.cpp b/src/plugins/qmldesigner/qmlpreviewplugin/qmlpreviewactions.cpp index ccd9a970096..ebd53b7f649 100644 --- a/src/plugins/qmldesigner/qmlpreviewplugin/qmlpreviewactions.cpp +++ b/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> diff --git a/src/plugins/qmlpreview/qmlpreviewfileontargetfinder.cpp b/src/plugins/qmlpreview/qmlpreviewfileontargetfinder.cpp index cf2ae2ef941..d1d9b4fced1 100644 --- a/src/plugins/qmlpreview/qmlpreviewfileontargetfinder.cpp +++ b/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> diff --git a/src/plugins/qmlpreview/qmlpreviewplugin.cpp b/src/plugins/qmlpreview/qmlpreviewplugin.cpp index d18b8c37b0e..5f0b23a3d61 100644 --- a/src/plugins/qmlpreview/qmlpreviewplugin.cpp +++ b/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> diff --git a/src/plugins/qmlprofiler/qmlprofilerattachdialog.cpp b/src/plugins/qmlprofiler/qmlprofilerattachdialog.cpp index 1b52367eb12..679166b19c7 100644 --- a/src/plugins/qmlprofiler/qmlprofilerattachdialog.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerattachdialog.cpp @@ -4,8 +4,8 @@ #include "qmlprofilerattachdialog.h" #include "qmlprofilertr.h" +#include <projectexplorer/kitaspects.h> #include <projectexplorer/kitchooser.h> -#include <projectexplorer/kitinformation.h> #include <QDialogButtonBox> #include <QFormLayout> diff --git a/src/plugins/qmlprofiler/qmlprofilerdetailsrewriter.cpp b/src/plugins/qmlprofiler/qmlprofilerdetailsrewriter.cpp index ff386c7a5ba..5fb1f203ef6 100644 --- a/src/plugins/qmlprofiler/qmlprofilerdetailsrewriter.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerdetailsrewriter.cpp @@ -4,7 +4,7 @@ #include "qmlprofilerdetailsrewriter.h" #include <projectexplorer/kit.h> -#include <projectexplorer/kitinformation.h> +#include <projectexplorer/kitaspects.h> #include <projectexplorer/project.h> #include <projectexplorer/projectmanager.h> #include <projectexplorer/target.h> diff --git a/src/plugins/qmlprofiler/qmlprofilerplugin.cpp b/src/plugins/qmlprofiler/qmlprofilerplugin.cpp index b605b249ca7..d1f6ef58996 100644 --- a/src/plugins/qmlprofiler/qmlprofilerplugin.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerplugin.cpp @@ -41,7 +41,7 @@ #include <extensionsystem/pluginmanager.h> #include <projectexplorer/environmentaspect.h> -#include <projectexplorer/kitinformation.h> +#include <projectexplorer/kitaspects.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/runconfiguration.h> #include <projectexplorer/target.h> diff --git a/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp b/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp index 41b67edda78..6e762a8dc05 100644 --- a/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp @@ -8,7 +8,7 @@ #include <coreplugin/icore.h> #include <coreplugin/helpmanager.h> -#include <projectexplorer/kitinformation.h> +#include <projectexplorer/kitaspects.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorericons.h> #include <projectexplorer/runconfiguration.h> diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp index 1f27fb30124..bd2e8f54b8a 100644 --- a/src/plugins/qmlprofiler/qmlprofilertool.cpp +++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp @@ -33,7 +33,7 @@ #include <projectexplorer/devicesupport/idevice.h> #include <projectexplorer/environmentaspect.h> -#include <projectexplorer/kitinformation.h> +#include <projectexplorer/kitaspects.h> #include <projectexplorer/project.h> #include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorerconstants.h> diff --git a/src/plugins/qmlprofiler/tests/qmlprofilerdetailsrewriter_test.cpp b/src/plugins/qmlprofiler/tests/qmlprofilerdetailsrewriter_test.cpp index 4cf135f0be7..4539948be37 100644 --- a/src/plugins/qmlprofiler/tests/qmlprofilerdetailsrewriter_test.cpp +++ b/src/plugins/qmlprofiler/tests/qmlprofilerdetailsrewriter_test.cpp @@ -6,7 +6,7 @@ #include <projectexplorer/buildconfiguration.h> #include <projectexplorer/buildinfo.h> #include <projectexplorer/customexecutablerunconfiguration.h> -#include <projectexplorer/kitinformation.h> +#include <projectexplorer/kitaspects.h> #include <projectexplorer/kitmanager.h> #include <projectexplorer/project.h> #include <projectexplorer/projectmanager.h> diff --git a/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.cpp b/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.cpp index 307b6d61451..c8f7f63bffa 100644 --- a/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.cpp +++ b/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.cpp @@ -27,7 +27,7 @@ #include <projectexplorer/deploymentdata.h> #include <projectexplorer/devicesupport/idevice.h> -#include <projectexplorer/kitinformation.h> +#include <projectexplorer/kitaspects.h> #include <projectexplorer/kitmanager.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/target.h> diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp index b5385bb4124..7daae789916 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp @@ -15,7 +15,7 @@ #include <projectexplorer/devicesupport/idevice.h> #include <projectexplorer/environmentaspect.h> -#include <projectexplorer/kitinformation.h> +#include <projectexplorer/kitaspects.h> #include <projectexplorer/kitmanager.h> #include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorerconstants.h> diff --git a/src/plugins/qnx/qnxdebugsupport.cpp b/src/plugins/qnx/qnxdebugsupport.cpp index 0d869d78673..f32f0a722b8 100644 --- a/src/plugins/qnx/qnxdebugsupport.cpp +++ b/src/plugins/qnx/qnxdebugsupport.cpp @@ -18,8 +18,8 @@ #include <projectexplorer/devicesupport/deviceusedportsgatherer.h> #include <projectexplorer/devicesupport/idevice.h> #include <projectexplorer/kit.h> +#include <projectexplorer/kitaspects.h> #include <projectexplorer/kitchooser.h> -#include <projectexplorer/kitinformation.h> #include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectmanager.h> #include <projectexplorer/runconfigurationaspects.h> diff --git a/src/plugins/qnx/qnxplugin.cpp b/src/plugins/qnx/qnxplugin.cpp index 09fd528086c..bd2aa2d8b18 100644 --- a/src/plugins/qnx/qnxplugin.cpp +++ b/src/plugins/qnx/qnxplugin.cpp @@ -19,16 +19,16 @@ #include <extensionsystem/iplugin.h> +#include <projectexplorer/buildconfiguration.h> +#include <projectexplorer/deployconfiguration.h> #include <projectexplorer/devicesupport/devicecheckbuildstep.h> #include <projectexplorer/devicesupport/devicemanager.h> -#include <projectexplorer/deployconfiguration.h> -#include <projectexplorer/kitinformation.h> -#include <projectexplorer/projectexplorer.h> -#include <projectexplorer/projectexplorerconstants.h> -#include <projectexplorer/kitmanager.h> #include <projectexplorer/environmentaspect.h> -#include <projectexplorer/buildconfiguration.h> +#include <projectexplorer/kitaspects.h> +#include <projectexplorer/kitmanager.h> #include <projectexplorer/project.h> +#include <projectexplorer/projectexplorer.h> +#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/target.h> #include <projectexplorer/toolchain.h> diff --git a/src/plugins/qtsupport/qtkitinformation.h b/src/plugins/qtsupport/qtkitinformation.h index f1f0a0b6a0b..723a7c71aab 100644 --- a/src/plugins/qtsupport/qtkitinformation.h +++ b/src/plugins/qtsupport/qtkitinformation.h @@ -7,7 +7,7 @@ #include "baseqtversion.h" -#include <projectexplorer/kitinformation.h> +#include <projectexplorer/kitaspects.h> namespace Utils { class MacroExpander; } diff --git a/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp b/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp index a8f3d31d1e9..6628d97615e 100644 --- a/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp +++ b/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp @@ -8,7 +8,7 @@ #include <projectexplorer/deployablefile.h> #include <projectexplorer/devicesupport/idevice.h> -#include <projectexplorer/kitinformation.h> +#include <projectexplorer/kitaspects.h> #include <solutions/tasking/tasktree.h> diff --git a/src/plugins/remotelinux/deploymenttimeinfo.cpp b/src/plugins/remotelinux/deploymenttimeinfo.cpp index e9c59156158..d403534c60d 100644 --- a/src/plugins/remotelinux/deploymenttimeinfo.cpp +++ b/src/plugins/remotelinux/deploymenttimeinfo.cpp @@ -6,7 +6,7 @@ #include <projectexplorer/deployablefile.h> #include <projectexplorer/devicesupport/idevice.h> #include <projectexplorer/devicesupport/sshparameters.h> -#include <projectexplorer/kitinformation.h> +#include <projectexplorer/kitaspects.h> #include <projectexplorer/target.h> #include <QDateTime> diff --git a/src/plugins/remotelinux/makeinstallstep.cpp b/src/plugins/remotelinux/makeinstallstep.cpp index 022dc9fd7cf..7556ad9947e 100644 --- a/src/plugins/remotelinux/makeinstallstep.cpp +++ b/src/plugins/remotelinux/makeinstallstep.cpp @@ -11,7 +11,7 @@ #include <projectexplorer/buildsystem.h> #include <projectexplorer/deployconfiguration.h> #include <projectexplorer/devicesupport/idevice.h> -#include <projectexplorer/kitinformation.h> +#include <projectexplorer/kitaspects.h> #include <projectexplorer/makestep.h> #include <projectexplorer/processparameters.h> #include <projectexplorer/projectexplorerconstants.h> diff --git a/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp b/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp index 7615a4ef553..537ca8ebe44 100644 --- a/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp +++ b/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp @@ -8,7 +8,7 @@ #include <projectexplorer/devicesupport/filetransferinterface.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> diff --git a/src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp b/src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp index d2c19e29613..d94857c4d66 100644 --- a/src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp +++ b/src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp @@ -10,7 +10,7 @@ #include <projectexplorer/environmentaspectwidget.h> #include <projectexplorer/environmentwidget.h> -#include <projectexplorer/kitinformation.h> +#include <projectexplorer/kitaspects.h> #include <projectexplorer/target.h> #include <utils/algorithm.h> diff --git a/src/plugins/remotelinux/remotelinuxplugin.cpp b/src/plugins/remotelinux/remotelinuxplugin.cpp index b3af1fb873d..2cb96de7405 100644 --- a/src/plugins/remotelinux/remotelinuxplugin.cpp +++ b/src/plugins/remotelinux/remotelinuxplugin.cpp @@ -22,7 +22,7 @@ #include "filesystemaccess_test.h" #endif -#include <projectexplorer/kitinformation.h> +#include <projectexplorer/kitaspects.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/target.h> diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp index 0165b0268f8..37633d8f3ea 100644 --- a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp +++ b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp @@ -11,7 +11,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/runcontrol.h> diff --git a/src/plugins/remotelinux/rsyncdeploystep.cpp b/src/plugins/remotelinux/rsyncdeploystep.cpp index 203fed34643..64544096b9c 100644 --- a/src/plugins/remotelinux/rsyncdeploystep.cpp +++ b/src/plugins/remotelinux/rsyncdeploystep.cpp @@ -12,7 +12,7 @@ #include <projectexplorer/devicesupport/devicemanager.h> #include <projectexplorer/devicesupport/filetransfer.h> #include <projectexplorer/devicesupport/idevice.h> -#include <projectexplorer/kitinformation.h> +#include <projectexplorer/kitaspects.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/runconfigurationaspects.h> #include <projectexplorer/target.h> diff --git a/src/plugins/studiowelcome/studiowelcomeplugin.cpp b/src/plugins/studiowelcome/studiowelcomeplugin.cpp index f2123cd2b2e..85f951cc632 100644 --- a/src/plugins/studiowelcome/studiowelcomeplugin.cpp +++ b/src/plugins/studiowelcome/studiowelcomeplugin.cpp @@ -18,7 +18,7 @@ #include "projectexplorer/target.h" #include <projectexplorer/devicesupport/idevice.h> #include <projectexplorer/jsonwizard/jsonwizardfactory.h> -#include <projectexplorer/kitinformation.h> +#include <projectexplorer/kitaspects.h> #include <projectexplorer/kitmanager.h> #include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorerconstants.h> diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp index 53d256ce806..158f4bb6e62 100644 --- a/src/plugins/valgrind/memchecktool.cpp +++ b/src/plugins/valgrind/memchecktool.cpp @@ -25,7 +25,7 @@ #include <projectexplorer/buildconfiguration.h> #include <projectexplorer/deploymentdata.h> #include <projectexplorer/devicesupport/devicemanager.h> -#include <projectexplorer/kitinformation.h> +#include <projectexplorer/kitaspects.h> #include <projectexplorer/project.h> #include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorerconstants.h> diff --git a/src/plugins/valgrind/valgrindengine.cpp b/src/plugins/valgrind/valgrindengine.cpp index fdbf6eb87db..601ba20ec9d 100644 --- a/src/plugins/valgrind/valgrindengine.cpp +++ b/src/plugins/valgrind/valgrindengine.cpp @@ -15,7 +15,7 @@ #include <extensionsystem/pluginmanager.h> #include <projectexplorer/devicesupport/idevice.h> -#include <projectexplorer/kitinformation.h> +#include <projectexplorer/kitaspects.h> #include <projectexplorer/projectexplorericons.h> #include <projectexplorer/runconfiguration.h> #include <projectexplorer/runconfigurationaspects.h> |