diff options
Diffstat (limited to 'src')
144 files changed, 396 insertions, 320 deletions
diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index 07ccde1f263..bc757e81889 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -14,12 +14,13 @@ #include <coreplugin/icore.h> #include <coreplugin/messagemanager.h> +#include <projectexplorer/devicesupport/devicekitaspects.h> #include <projectexplorer/devicesupport/devicemanager.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/kitmanager.h> #include <projectexplorer/project.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectmanager.h> +#include <projectexplorer/toolchainkitaspect.h> #include <projectexplorer/toolchainmanager.h> #include <debugger/debuggeritemmanager.h> diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp index 0db55016889..0a0717d26cd 100644 --- a/src/plugins/android/androiddeployqtstep.cpp +++ b/src/plugins/android/androiddeployqtstep.cpp @@ -17,7 +17,7 @@ #include <projectexplorer/buildconfiguration.h> #include <projectexplorer/buildsystem.h> #include <projectexplorer/buildsteplist.h> -#include <projectexplorer/kitaspects.h> +#include <projectexplorer/devicesupport/devicekitaspects.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/project.h> #include <projectexplorer/runconfiguration.h> diff --git a/src/plugins/android/androiddevice.cpp b/src/plugins/android/androiddevice.cpp index 316e2470396..363646f0006 100644 --- a/src/plugins/android/androiddevice.cpp +++ b/src/plugins/android/androiddevice.cpp @@ -17,7 +17,7 @@ #include <projectexplorer/devicesupport/devicemanager.h> #include <projectexplorer/devicesupport/idevicefactory.h> #include <projectexplorer/devicesupport/idevicewidget.h> -#include <projectexplorer/kitaspects.h> +#include <projectexplorer/environmentkitaspect.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/runconfiguration.h> #include <projectexplorer/projectmanager.h> diff --git a/src/plugins/android/androidmanifesteditor.cpp b/src/plugins/android/androidmanifesteditor.cpp index e2deb3288f0..b344b4a3a0a 100644 --- a/src/plugins/android/androidmanifesteditor.cpp +++ b/src/plugins/android/androidmanifesteditor.cpp @@ -15,7 +15,7 @@ #include <qtsupport/qtkitaspect.h> #include <projectexplorer/buildconfiguration.h> -#include <projectexplorer/kitaspects.h> +#include <projectexplorer/devicesupport/devicekitaspects.h> #include <projectexplorer/project.h> #include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectmanager.h> diff --git a/src/plugins/android/androidpackageinstallationstep.cpp b/src/plugins/android/androidpackageinstallationstep.cpp index 1595180196d..4c020b2ab97 100644 --- a/src/plugins/android/androidpackageinstallationstep.cpp +++ b/src/plugins/android/androidpackageinstallationstep.cpp @@ -12,12 +12,12 @@ #include <projectexplorer/buildsteplist.h> #include <projectexplorer/buildsystem.h> #include <projectexplorer/gnumakeparser.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/toolchainkitaspect.h> #include <qtsupport/baseqtversion.h> #include <qtsupport/qtkitaspect.h> diff --git a/src/plugins/android/androidplugin.cpp b/src/plugins/android/androidplugin.cpp index 50217a6f8c0..3e268bc16ed 100644 --- a/src/plugins/android/androidplugin.cpp +++ b/src/plugins/android/androidplugin.cpp @@ -32,7 +32,7 @@ #include <projectexplorer/buildconfiguration.h> #include <projectexplorer/deployconfiguration.h> #include <projectexplorer/devicesupport/devicemanager.h> -#include <projectexplorer/kitaspects.h> +#include <projectexplorer/environmentkitaspect.h> #include <projectexplorer/kitmanager.h> #include <projectexplorer/project.h> #include <projectexplorer/projectexplorerconstants.h> diff --git a/src/plugins/android/androidrunconfiguration.cpp b/src/plugins/android/androidrunconfiguration.cpp index a8aa3bc95c9..78e7baae2c5 100644 --- a/src/plugins/android/androidrunconfiguration.cpp +++ b/src/plugins/android/androidrunconfiguration.cpp @@ -7,7 +7,7 @@ #include <projectexplorer/buildconfiguration.h> #include <projectexplorer/buildsystem.h> -#include <projectexplorer/kitaspects.h> +#include <projectexplorer/environmentkitaspect.h> #include <projectexplorer/project.h> #include <projectexplorer/runconfigurationaspects.h> #include <projectexplorer/target.h> diff --git a/src/plugins/android/androidrunner.cpp b/src/plugins/android/androidrunner.cpp index ce641ea6a33..6b8150ec037 100644 --- a/src/plugins/android/androidrunner.cpp +++ b/src/plugins/android/androidrunner.cpp @@ -9,7 +9,7 @@ #include "androidrunnerworker.h" #include "androidutils.h" -#include <projectexplorer/kitaspects.h> +#include <projectexplorer/devicesupport/devicekitaspects.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorersettings.h> #include <projectexplorer/target.h> diff --git a/src/plugins/android/javalanguageserver.cpp b/src/plugins/android/javalanguageserver.cpp index fbeebd8418d..fbf02616d8b 100644 --- a/src/plugins/android/javalanguageserver.cpp +++ b/src/plugins/android/javalanguageserver.cpp @@ -12,7 +12,7 @@ #include <languageclient/languageclientsettings.h> #include <languageclient/languageclientutils.h> -#include <projectexplorer/kitaspects.h> +#include <projectexplorer/devicesupport/devicekitaspects.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 d1fd8880ab1..5e61e8ea07a 100644 --- a/src/plugins/autotest/autotestunittests.cpp +++ b/src/plugins/autotest/autotestunittests.cpp @@ -15,10 +15,10 @@ #include <extensionsystem/pluginmanager.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/kitmanager.h> #include <projectexplorer/projectexplorer.h> #include <projectexplorer/toolchain.h> +#include <projectexplorer/toolchainkitaspect.h> #include <qtsupport/qtkitaspect.h> diff --git a/src/plugins/autotest/testconfiguration.cpp b/src/plugins/autotest/testconfiguration.cpp index abd166876a2..a2579bf74ae 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/kitaspects.h> +#include <projectexplorer/devicesupport/devicekitaspects.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 521289650fd..0e71da2f3f2 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/kitaspects.h> +#include <projectexplorer/environmentkitaspect.h> #include <projectexplorer/project.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/runconfiguration.h> diff --git a/src/plugins/boot2qt/qdbrunconfiguration.cpp b/src/plugins/boot2qt/qdbrunconfiguration.cpp index b3f1484d5e9..cbeb71c4d10 100644 --- a/src/plugins/boot2qt/qdbrunconfiguration.cpp +++ b/src/plugins/boot2qt/qdbrunconfiguration.cpp @@ -9,8 +9,8 @@ #include <projectexplorer/buildsystem.h> #include <projectexplorer/buildtargetinfo.h> #include <projectexplorer/deploymentdata.h> +#include <projectexplorer/devicesupport/devicekitaspects.h> #include <projectexplorer/devicesupport/idevice.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 4f3e2741e62..550327e6521 100644 --- a/src/plugins/boot2qt/qdbstopapplicationstep.cpp +++ b/src/plugins/boot2qt/qdbstopapplicationstep.cpp @@ -6,8 +6,8 @@ #include "qdbconstants.h" #include "qdbtr.h" +#include <projectexplorer/devicesupport/devicekitaspects.h> #include <projectexplorer/devicesupport/idevice.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 2184ecbcf8a..1b3cf54f0e0 100644 --- a/src/plugins/clangcodemodel/clangdclient.cpp +++ b/src/plugins/clangcodemodel/clangdclient.cpp @@ -44,8 +44,8 @@ #include <languageserverprotocol/clientcapabilities.h> #include <languageserverprotocol/progresssupport.h> #include <projectexplorer/buildconfiguration.h> +#include <projectexplorer/devicesupport/devicekitaspects.h> #include <projectexplorer/devicesupport/idevice.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/project.h> #include <projectexplorer/projectnodes.h> #include <projectexplorer/projecttree.h> diff --git a/src/plugins/clangcodemodel/clangutils.cpp b/src/plugins/clangcodemodel/clangutils.cpp index c85062982ec..2de8d875e7f 100644 --- a/src/plugins/clangcodemodel/clangutils.cpp +++ b/src/plugins/clangcodemodel/clangutils.cpp @@ -18,7 +18,7 @@ #include <cppeditor/editordocumenthandle.h> #include <cppeditor/projectpart.h> #include <projectexplorer/buildconfiguration.h> -#include <projectexplorer/kitaspects.h> +#include <projectexplorer/environmentkitaspect.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/target.h> #include <texteditor/texteditor.h> diff --git a/src/plugins/clangtools/clangtool.cpp b/src/plugins/clangtools/clangtool.cpp index 3bc92f403bc..e4d993b7d9c 100644 --- a/src/plugins/clangtools/clangtool.cpp +++ b/src/plugins/clangtools/clangtool.cpp @@ -28,7 +28,6 @@ #include <projectexplorer/buildconfiguration.h> #include <projectexplorer/buildmanager.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorericons.h> @@ -36,6 +35,7 @@ #include <projectexplorer/runcontrol.h> #include <projectexplorer/target.h> #include <projectexplorer/taskhub.h> +#include <projectexplorer/toolchainkitaspect.h> #include <solutions/tasking/tasktree.h> diff --git a/src/plugins/clangtools/clangtoolsplugin.cpp b/src/plugins/clangtools/clangtoolsplugin.cpp index a39799612a2..85f886fc1c4 100644 --- a/src/plugins/clangtools/clangtoolsplugin.cpp +++ b/src/plugins/clangtools/clangtoolsplugin.cpp @@ -36,7 +36,7 @@ #include <texteditor/texteditor.h> -#include <projectexplorer/kitaspects.h> +#include <projectexplorer/environmentkitaspect.h> #include <projectexplorer/target.h> #include <projectexplorer/taskhub.h> diff --git a/src/plugins/clangtools/clangtoolspreconfiguredsessiontests.cpp b/src/plugins/clangtools/clangtoolspreconfiguredsessiontests.cpp index e33f91af331..50af71274be 100644 --- a/src/plugins/clangtools/clangtoolspreconfiguredsessiontests.cpp +++ b/src/plugins/clangtools/clangtoolspreconfiguredsessiontests.cpp @@ -12,13 +12,13 @@ #include <cppeditor/compileroptionsbuilder.h> #include <cppeditor/projectinfo.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/kitmanager.h> #include <projectexplorer/project.h> #include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectmanager.h> #include <projectexplorer/target.h> #include <projectexplorer/toolchain.h> +#include <projectexplorer/toolchainkitaspect.h> #include <utils/algorithm.h> #include <utils/filepath.h> diff --git a/src/plugins/clangtools/clangtoolsunittests.cpp b/src/plugins/clangtools/clangtoolsunittests.cpp index a5bf4f10ef6..d8906aee27e 100644 --- a/src/plugins/clangtools/clangtoolsunittests.cpp +++ b/src/plugins/clangtools/clangtoolsunittests.cpp @@ -14,11 +14,11 @@ #include <cppeditor/cpptoolsreuse.h> #include <cppeditor/cpptoolstestcase.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/kitmanager.h> #include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/toolchain.h> +#include <projectexplorer/toolchainkitaspect.h> #include <qtsupport/qtkitaspect.h> diff --git a/src/plugins/cmakeprojectmanager/builddirparameters.cpp b/src/plugins/cmakeprojectmanager/builddirparameters.cpp index 0785ca8d959..02169fdd19b 100644 --- a/src/plugins/cmakeprojectmanager/builddirparameters.cpp +++ b/src/plugins/cmakeprojectmanager/builddirparameters.cpp @@ -10,7 +10,7 @@ #include "cmaketoolmanager.h" #include <projectexplorer/customparser.h> -#include <projectexplorer/kitaspects.h> +#include <projectexplorer/environmentkitaspect.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 29be8db113e..f920c647757 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp @@ -31,11 +31,11 @@ #include <projectexplorer/buildinfo.h> #include <projectexplorer/buildmanager.h> #include <projectexplorer/buildsteplist.h> +#include <projectexplorer/devicesupport/devicekitaspects.h> #include <projectexplorer/devicesupport/idevice.h> #include <projectexplorer/environmentaspectwidget.h> #include <projectexplorer/environmentwidget.h> #include <projectexplorer/kitaspect.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/kitmanager.h> #include <projectexplorer/namedwidget.h> #include <projectexplorer/processparameters.h> @@ -44,8 +44,10 @@ #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorertr.h> #include <projectexplorer/projectmanager.h> +#include <projectexplorer/sysrootkitaspect.h> #include <projectexplorer/target.h> #include <projectexplorer/taskhub.h> +#include <projectexplorer/toolchainkitaspect.h> #include <qtsupport/baseqtversion.h> #include <qtsupport/qtbuildaspects.h> diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp index 042a23903ce..50a389e2d27 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp @@ -24,10 +24,10 @@ #include <coreplugin/find/itemviewfind.h> #include <projectexplorer/buildsteplist.h> +#include <projectexplorer/devicesupport/devicekitaspects.h> #include <projectexplorer/devicesupport/idevice.h> #include <projectexplorer/environmentwidget.h> #include <projectexplorer/gnumakeparser.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/processparameters.h> #include <projectexplorer/project.h> #include <projectexplorer/projectexplorer.h> @@ -35,6 +35,7 @@ #include <projectexplorer/projectexplorertr.h> #include <projectexplorer/runconfiguration.h> #include <projectexplorer/target.h> +#include <projectexplorer/toolchainkitaspect.h> #include <projectexplorer/xcodebuildparser.h> #include <utils/algorithm.h> diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp index d5ccb107cf5..c3bce2741cc 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp @@ -26,8 +26,8 @@ #include <coreplugin/progressmanager/progressmanager.h> #include <projectexplorer/buildmanager.h> +#include <projectexplorer/devicesupport/devicekitaspects.h> #include <projectexplorer/extracompiler.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectupdater.h> diff --git a/src/plugins/cmakeprojectmanager/cmakekitaspect.cpp b/src/plugins/cmakeprojectmanager/cmakekitaspect.cpp index 849154940dc..1b7ece214cc 100644 --- a/src/plugins/cmakeprojectmanager/cmakekitaspect.cpp +++ b/src/plugins/cmakeprojectmanager/cmakekitaspect.cpp @@ -15,15 +15,16 @@ #include <ios/iosconstants.h> +#include <projectexplorer/devicesupport/devicekitaspects.h> #include <projectexplorer/devicesupport/idevice.h> #include <projectexplorer/kitaspect.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/kitmanager.h> #include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorersettings.h> #include <projectexplorer/task.h> #include <projectexplorer/toolchain.h> +#include <projectexplorer/toolchainkitaspect.h> #include <qtsupport/baseqtversion.h> #include <qtsupport/qtkitaspect.h> diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp index f81f89af69b..e488b8772ae 100644 --- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp @@ -13,12 +13,12 @@ #include <projectexplorer/buildconfiguration.h> #include <projectexplorer/buildinfo.h> #include <projectexplorer/buildsteplist.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/kitmanager.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectnodes.h> #include <projectexplorer/target.h> #include <projectexplorer/taskhub.h> +#include <projectexplorer/toolchainkitaspect.h> #include <qtsupport/qtkitaspect.h> diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp index 4613b68ed7a..e55a49132ce 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp @@ -17,11 +17,12 @@ #include <debugger/debuggerkitaspect.h> #include <projectexplorer/buildinfo.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/kitmanager.h> #include <projectexplorer/projectexplorerconstants.h> +#include <projectexplorer/sysrootkitaspect.h> #include <projectexplorer/target.h> #include <projectexplorer/taskhub.h> +#include <projectexplorer/toolchainkitaspect.h> #include <projectexplorer/toolchainmanager.h> #include <qtsupport/qtkitaspect.h> diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp index dcb595cb7a3..50a849f7a1a 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp @@ -30,7 +30,6 @@ #include <debugger/analyzer/analyzermanager.h> #include <projectexplorer/buildmanager.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/project.h> #include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorerconstants.h> @@ -39,6 +38,7 @@ #include <projectexplorer/projecttree.h> #include <projectexplorer/runcontrol.h> #include <projectexplorer/target.h> +#include <projectexplorer/toolchainkitaspect.h> #include <utils/action.h> #include <utils/checkablemessagebox.h> diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp index 5976f347d82..7d4752d4407 100644 --- a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp +++ b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp @@ -17,13 +17,13 @@ #include <projectexplorer/deploymentdata.h> #include <projectexplorer/gcctoolchain.h> #include <projectexplorer/headerpath.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/kitmanager.h> #include <projectexplorer/namedwidget.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectnodes.h> #include <projectexplorer/projectupdater.h> #include <projectexplorer/target.h> +#include <projectexplorer/toolchainkitaspect.h> #include <projectexplorer/toolchainmanager.h> #include <texteditor/textdocument.h> diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdatabasetests.cpp b/src/plugins/compilationdatabaseprojectmanager/compilationdatabasetests.cpp index b2a2995f30c..f4d47f20e5b 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/kitaspects.h> +#include <projectexplorer/environmentkitaspect.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 7dd5dc56cae..8bacae0eeb3 100644 --- a/src/plugins/conan/conaninstallstep.cpp +++ b/src/plugins/conan/conaninstallstep.cpp @@ -12,7 +12,6 @@ #include <projectexplorer/buildstep.h> #include <projectexplorer/buildsteplist.h> #include <projectexplorer/gnumakeparser.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/processparameters.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/project.h> @@ -20,6 +19,7 @@ #include <projectexplorer/task.h> #include <projectexplorer/toolchain.h> #include <projectexplorer/projectmanager.h> +#include <projectexplorer/toolchainkitaspect.h> using namespace ProjectExplorer; using namespace Utils; diff --git a/src/plugins/cppcheck/cppcheckplugin.cpp b/src/plugins/cppcheck/cppcheckplugin.cpp index 341b25db029..248223eecd8 100644 --- a/src/plugins/cppcheck/cppcheckplugin.cpp +++ b/src/plugins/cppcheck/cppcheckplugin.cpp @@ -19,12 +19,12 @@ #include <extensionsystem/iplugin.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/project.h> #include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectmanager.h> #include <projectexplorer/target.h> +#include <projectexplorer/toolchainkitaspect.h> #include <utils/layoutbuilder.h> #include <utils/qtcassert.h> diff --git a/src/plugins/cppeditor/cppmodelmanager.cpp b/src/plugins/cppeditor/cppmodelmanager.cpp index d9a5c7e6f2f..6b67a5f9755 100644 --- a/src/plugins/cppeditor/cppmodelmanager.cpp +++ b/src/plugins/cppeditor/cppmodelmanager.cpp @@ -48,7 +48,6 @@ #include <projectexplorer/buildconfiguration.h> #include <projectexplorer/gcctoolchain.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/kitmanager.h> #include <projectexplorer/project.h> #include <projectexplorer/projectexplorer.h> @@ -57,7 +56,9 @@ #include <projectexplorer/projectmacro.h> #include <projectexplorer/projectnodes.h> #include <projectexplorer/projecttree.h> +#include <projectexplorer/sysrootkitaspect.h> #include <projectexplorer/target.h> +#include <projectexplorer/toolchainkitaspect.h> #include <texteditor/textdocument.h> #include <texteditor/textdocumentlayout.h> diff --git a/src/plugins/cppeditor/projectinfo.cpp b/src/plugins/cppeditor/projectinfo.cpp index e25070044bd..00dd40040e4 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/kitaspects.h> +#include <projectexplorer/environmentkitaspect.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectmanager.h> #include <projectexplorer/rawprojectpart.h> diff --git a/src/plugins/debugger/analyzer/startremotedialog.cpp b/src/plugins/debugger/analyzer/startremotedialog.cpp index c8dd079122a..d1bb259df7c 100644 --- a/src/plugins/debugger/analyzer/startremotedialog.cpp +++ b/src/plugins/debugger/analyzer/startremotedialog.cpp @@ -7,9 +7,9 @@ #include <coreplugin/icore.h> +#include <projectexplorer/devicesupport/devicekitaspects.h> #include <projectexplorer/devicesupport/idevice.h> #include <projectexplorer/devicesupport/sshparameters.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/kitchooser.h> #include <utils/commandline.h> diff --git a/src/plugins/debugger/debuggerdialogs.cpp b/src/plugins/debugger/debuggerdialogs.cpp index 3ced7bd8d3b..c6842c6b2c3 100644 --- a/src/plugins/debugger/debuggerdialogs.cpp +++ b/src/plugins/debugger/debuggerdialogs.cpp @@ -9,8 +9,8 @@ #include <coreplugin/icore.h> +#include <projectexplorer/devicesupport/devicekitaspects.h> #include <projectexplorer/devicesupport/sshparameters.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/kitmanager.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/toolchain.h> diff --git a/src/plugins/debugger/debuggerkitaspect.cpp b/src/plugins/debugger/debuggerkitaspect.cpp index 3f9aeecb26e..946f1e1ca3e 100644 --- a/src/plugins/debugger/debuggerkitaspect.cpp +++ b/src/plugins/debugger/debuggerkitaspect.cpp @@ -8,11 +8,12 @@ #include "debuggertr.h" #include <projectexplorer/devicesupport/idevice.h> +#include <projectexplorer/devicesupport/devicekitaspects.h> #include <projectexplorer/kit.h> #include <projectexplorer/kitaspect.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/toolchain.h> +#include <projectexplorer/toolchainkitaspect.h> #include <utils/environment.h> #include <utils/guard.h> diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index 8d0d4320ff7..f91c392f4c7 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -57,11 +57,11 @@ #include <projectexplorer/buildconfiguration.h> #include <projectexplorer/buildmanager.h> #include <projectexplorer/buildsystem.h> +#include <projectexplorer/devicesupport/devicekitaspects.h> #include <projectexplorer/devicesupport/idevice.h> #include <projectexplorer/devicesupport/deviceprocessesdialog.h> #include <projectexplorer/devicesupport/sshparameters.h> #include <projectexplorer/itaskhandler.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/kitmanager.h> #include <projectexplorer/project.h> #include <projectexplorer/projectexplorer.h> @@ -75,6 +75,7 @@ #include <projectexplorer/target.h> #include <projectexplorer/taskhub.h> #include <projectexplorer/toolchain.h> +#include <projectexplorer/toolchainkitaspect.h> #include <texteditor/texteditor.h> #include <texteditor/textdocument.h> diff --git a/src/plugins/debugger/debuggerrunconfigurationaspect.cpp b/src/plugins/debugger/debuggerrunconfigurationaspect.cpp index 4bd1dec9675..80ce3cba330 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/kitaspects.h> +#include <projectexplorer/environmentkitaspect.h> #include <projectexplorer/project.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/runconfiguration.h> diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp index 1549a5e94b8..bb30d87460d 100644 --- a/src/plugins/debugger/debuggerruncontrol.cpp +++ b/src/plugins/debugger/debuggerruncontrol.cpp @@ -19,7 +19,6 @@ #include <projectexplorer/devicesupport/deviceprocessesdialog.h> #include <projectexplorer/devicesupport/idevice.h> #include <projectexplorer/environmentaspect.h> // For the environment -#include <projectexplorer/kitaspects.h> #include <projectexplorer/project.h> #include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorericons.h> @@ -27,6 +26,8 @@ #include <projectexplorer/runconfigurationaspects.h> #include <projectexplorer/projectmanager.h> #include <projectexplorer/qmldebugcommandlinearguments.h> +#include <projectexplorer/sysrootkitaspect.h> +#include <projectexplorer/toolchainkitaspect.h> #include <projectexplorer/target.h> #include <projectexplorer/taskhub.h> #include <projectexplorer/toolchain.h> diff --git a/src/plugins/debugger/unstartedappwatcherdialog.cpp b/src/plugins/debugger/unstartedappwatcherdialog.cpp index f46992ac799..cc1c13c5415 100644 --- a/src/plugins/debugger/unstartedappwatcherdialog.cpp +++ b/src/plugins/debugger/unstartedappwatcherdialog.cpp @@ -8,15 +8,16 @@ #include "debuggertr.h" #include <projectexplorer/buildconfiguration.h> +#include <projectexplorer/devicesupport/devicekitaspects.h> #include <projectexplorer/kit.h> #include <projectexplorer/kitchooser.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/kitmanager.h> #include <projectexplorer/project.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projecttree.h> #include <projectexplorer/runconfiguration.h> #include <projectexplorer/target.h> +#include <projectexplorer/toolchainkitaspect.h> #include <utils/fileutils.h> #include <utils/pathchooser.h> diff --git a/src/plugins/docker/dockerdevice.cpp b/src/plugins/docker/dockerdevice.cpp index ffe0cb84e33..8f6e839ba35 100644 --- a/src/plugins/docker/dockerdevice.cpp +++ b/src/plugins/docker/dockerdevice.cpp @@ -19,7 +19,7 @@ #include <projectexplorer/devicesupport/devicemanager.h> #include <projectexplorer/devicesupport/idevicewidget.h> #include <projectexplorer/devicesupport/processlist.h> -#include <projectexplorer/kitaspects.h> +#include <projectexplorer/environmentkitaspect.h> #include <projectexplorer/kitmanager.h> #include <projectexplorer/project.h> #include <projectexplorer/projectexplorertr.h> diff --git a/src/plugins/docker/kitdetector.cpp b/src/plugins/docker/kitdetector.cpp index f0e3f0c8026..ddd5c174712 100644 --- a/src/plugins/docker/kitdetector.cpp +++ b/src/plugins/docker/kitdetector.cpp @@ -7,11 +7,12 @@ #include <extensionsystem/pluginmanager.h> +#include <projectexplorer/devicesupport/devicekitaspects.h> #include <projectexplorer/devicesupport/idevice.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/kitmanager.h> #include <projectexplorer/projectexplorertr.h> #include <projectexplorer/toolchain.h> +#include <projectexplorer/toolchainkitaspect.h> #include <projectexplorer/toolchainmanager.h> #include <qtsupport/baseqtversion.h> diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp index f35f985230d..554d3629bf9 100644 --- a/src/plugins/genericprojectmanager/genericproject.cpp +++ b/src/plugins/genericprojectmanager/genericproject.cpp @@ -18,8 +18,8 @@ #include <projectexplorer/buildsystem.h> #include <projectexplorer/customexecutablerunconfiguration.h> #include <projectexplorer/deploymentdata.h> +#include <projectexplorer/environmentkitaspect.h> #include <projectexplorer/headerpath.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/kitmanager.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectmanager.h> diff --git a/src/plugins/incredibuild/makecommandbuilder.cpp b/src/plugins/incredibuild/makecommandbuilder.cpp index 9a100427ab7..f9fb4a59587 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/kitaspects.h> #include <projectexplorer/project.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/target.h> #include <projectexplorer/toolchain.h> +#include <projectexplorer/toolchainkitaspect.h> #include <qmakeprojectmanager/qmakeprojectmanagerconstants.h> // Compile-time only diff --git a/src/plugins/ios/iosbuildconfiguration.cpp b/src/plugins/ios/iosbuildconfiguration.cpp index cdccff57fa4..eadda24575c 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/kitaspects.h> +#include <projectexplorer/devicesupport/devicekitaspects.h> #include <projectexplorer/namedwidget.h> #include <projectexplorer/target.h> diff --git a/src/plugins/ios/iosbuildstep.cpp b/src/plugins/ios/iosbuildstep.cpp index c9d396ddd46..bc3fdc29801 100644 --- a/src/plugins/ios/iosbuildstep.cpp +++ b/src/plugins/ios/iosbuildstep.cpp @@ -11,13 +11,14 @@ #include <projectexplorer/buildsteplist.h> #include <projectexplorer/gcctoolchain.h> #include <projectexplorer/gnumakeparser.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/processparameters.h> #include <projectexplorer/project.h> #include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorerconstants.h> +#include <projectexplorer/sysrootkitaspect.h> #include <projectexplorer/target.h> #include <projectexplorer/toolchain.h> +#include <projectexplorer/toolchainkitaspect.h> #include <utils/filepath.h> #include <utils/qtcprocess.h> diff --git a/src/plugins/ios/iosconfigurations.cpp b/src/plugins/ios/iosconfigurations.cpp index b9eeea159be..6fd35cb6234 100644 --- a/src/plugins/ios/iosconfigurations.cpp +++ b/src/plugins/ios/iosconfigurations.cpp @@ -12,14 +12,16 @@ #include <coreplugin/icore.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/kitmanager.h> +#include <projectexplorer/devicesupport/devicekitaspects.h> #include <projectexplorer/devicesupport/devicemanager.h> #include <projectexplorer/devicesupport/idevice.h> #include <projectexplorer/toolchainmanager.h> #include <projectexplorer/toolchain.h> #include <projectexplorer/gcctoolchain.h> #include <projectexplorer/projectexplorerconstants.h> +#include <projectexplorer/sysrootkitaspect.h> +#include <projectexplorer/toolchainkitaspect.h> #include <projectexplorer/toolchainconfigwidget.h> #include <debugger/debuggeritemmanager.h> diff --git a/src/plugins/ios/iosdeploystep.cpp b/src/plugins/ios/iosdeploystep.cpp index 85b18ff59df..e9825fb6ce1 100644 --- a/src/plugins/ios/iosdeploystep.cpp +++ b/src/plugins/ios/iosdeploystep.cpp @@ -12,12 +12,12 @@ #include "iostr.h" #include <projectexplorer/buildconfiguration.h> +#include <projectexplorer/devicesupport/devicekitaspects.h> +#include <projectexplorer/devicesupport/devicemanager.h> +#include <projectexplorer/kitmanager.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/target.h> #include <projectexplorer/taskhub.h> -#include <projectexplorer/kitaspects.h> -#include <projectexplorer/kitmanager.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 abf0c0dc79c..61fe5641234 100644 --- a/src/plugins/ios/iosdevice.cpp +++ b/src/plugins/ios/iosdevice.cpp @@ -18,7 +18,7 @@ #include <projectexplorer/devicesupport/devicemanager.h> #include <projectexplorer/devicesupport/idevicefactory.h> #include <projectexplorer/devicesupport/idevicewidget.h> -#include <projectexplorer/kitaspects.h> +#include <projectexplorer/environmentkitaspect.h> #include <utils/layoutbuilder.h> #include <utils/portlist.h> diff --git a/src/plugins/ios/iosdsymbuildstep.cpp b/src/plugins/ios/iosdsymbuildstep.cpp index c0aa4a06eea..8753f7062ea 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/kitaspects.h> +#include <projectexplorer/environmentkitaspect.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 df7cc2bff64..42c6fc455cd 100644 --- a/src/plugins/ios/iosrunconfiguration.cpp +++ b/src/plugins/ios/iosrunconfiguration.cpp @@ -12,8 +12,8 @@ #include <projectexplorer/buildstep.h> #include <projectexplorer/buildsteplist.h> #include <projectexplorer/deployconfiguration.h> +#include <projectexplorer/devicesupport/devicekitaspects.h> #include <projectexplorer/devicesupport/devicemanager.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/kitmanager.h> #include <projectexplorer/project.h> #include <projectexplorer/projectexplorerconstants.h> diff --git a/src/plugins/ios/iosrunner.cpp b/src/plugins/ios/iosrunner.cpp index b10142d753e..7f111ea351e 100644 --- a/src/plugins/ios/iosrunner.cpp +++ b/src/plugins/ios/iosrunner.cpp @@ -16,7 +16,7 @@ #include <debugger/debuggerkitaspect.h> #include <debugger/debuggerruncontrol.h> -#include <projectexplorer/kitaspects.h> +#include <projectexplorer/devicesupport/devicekitaspects.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/qmldebugcommandlinearguments.h> #include <projectexplorer/runconfigurationaspects.h> diff --git a/src/plugins/ios/iossimulator.cpp b/src/plugins/ios/iossimulator.cpp index 13877d9c143..a5f3fbb3464 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/kitaspects.h> +#include <projectexplorer/environmentkitaspect.h> #include <utils/port.h> #include <utils/qtcprocess.h> diff --git a/src/plugins/mcusupport/mcukitmanager.cpp b/src/plugins/mcusupport/mcukitmanager.cpp index d095d5cbd6d..194c5efd840 100644 --- a/src/plugins/mcusupport/mcukitmanager.cpp +++ b/src/plugins/mcusupport/mcukitmanager.cpp @@ -23,10 +23,13 @@ #include <debugger/debuggeritemmanager.h> #include <debugger/debuggerkitaspect.h> -#include <projectexplorer/kitaspects.h> +#include <projectexplorer/devicesupport/devicekitaspects.h> +#include <projectexplorer/environmentkitaspect.h> #include <projectexplorer/kitmanager.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/toolchain.h> +#include <projectexplorer/sysrootkitaspect.h> +#include <projectexplorer/toolchainkitaspect.h> #include <qtsupport/qtkitaspect.h> #include <qtsupport/qtsupportconstants.h> diff --git a/src/plugins/mcusupport/test/unittest.cpp b/src/plugins/mcusupport/test/unittest.cpp index 2bbdfdfc318..4465f5a066d 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/kitaspects.h> +#include <projectexplorer/environmentkitaspect.h> #include <projectexplorer/kitmanager.h> #include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorerconstants.h> diff --git a/src/plugins/mesonprojectmanager/mesonbuildsystem.cpp b/src/plugins/mesonprojectmanager/mesonbuildsystem.cpp index 022f24000af..249a6b23b63 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/kitaspects.h> +#include <projectexplorer/environmentkitaspect.h> #include <projectexplorer/kitmanager.h> #include <projectexplorer/projectupdater.h> #include <projectexplorer/taskhub.h> diff --git a/src/plugins/mesonprojectmanager/mesonproject.cpp b/src/plugins/mesonprojectmanager/mesonproject.cpp index 159423881ea..74bc1838067 100644 --- a/src/plugins/mesonprojectmanager/mesonproject.cpp +++ b/src/plugins/mesonprojectmanager/mesonproject.cpp @@ -10,10 +10,10 @@ #include <coreplugin/icontext.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/project.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectmanager.h> +#include <projectexplorer/toolchainkitaspect.h> using namespace ProjectExplorer; diff --git a/src/plugins/nim/project/nimbuildsystem.cpp b/src/plugins/nim/project/nimbuildsystem.cpp index 5ffd852c41a..b8425df69a2 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/toolchainkitaspect.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 aaf6ff42969..8c2dfa67c40 100644 --- a/src/plugins/nim/project/nimcompilerbuildstep.cpp +++ b/src/plugins/nim/project/nimcompilerbuildstep.cpp @@ -10,11 +10,11 @@ #include <projectexplorer/buildconfiguration.h> #include <projectexplorer/ioutputparser.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/processparameters.h> #include <projectexplorer/project.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/toolchain.h> +#include <projectexplorer/toolchainkitaspect.h> #include <utils/qtcprocess.h> #include <utils/qtcassert.h> diff --git a/src/plugins/nim/project/nimproject.cpp b/src/plugins/nim/project/nimproject.cpp index 33f09d19328..53e91b88a80 100644 --- a/src/plugins/nim/project/nimproject.cpp +++ b/src/plugins/nim/project/nimproject.cpp @@ -9,10 +9,10 @@ #include <coreplugin/icontext.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectmanager.h> #include <projectexplorer/toolchain.h> +#include <projectexplorer/toolchainkitaspect.h> using namespace ProjectExplorer; using namespace Utils; diff --git a/src/plugins/perfprofiler/perfdatareader.cpp b/src/plugins/perfprofiler/perfdatareader.cpp index 5c690e8d276..8f02fea9e06 100644 --- a/src/plugins/perfprofiler/perfdatareader.cpp +++ b/src/plugins/perfprofiler/perfdatareader.cpp @@ -11,12 +11,13 @@ #include <coreplugin/progressmanager/progressmanager.h> #include <projectexplorer/buildconfiguration.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/project.h> #include <projectexplorer/projectmanager.h> #include <projectexplorer/runcontrol.h> +#include <projectexplorer/sysrootkitaspect.h> #include <projectexplorer/target.h> #include <projectexplorer/toolchain.h> +#include <projectexplorer/toolchainkitaspect.h> #include <utils/environment.h> #include <utils/qtcassert.h> diff --git a/src/plugins/perfprofiler/perfprofilerruncontrol.cpp b/src/plugins/perfprofiler/perfprofilerruncontrol.cpp index b279f9d101c..78348d411c7 100644 --- a/src/plugins/perfprofiler/perfprofilerruncontrol.cpp +++ b/src/plugins/perfprofiler/perfprofilerruncontrol.cpp @@ -11,7 +11,7 @@ #include <coreplugin/messagemanager.h> #include <projectexplorer/devicesupport/idevice.h> -#include <projectexplorer/kitaspects.h> +#include <projectexplorer/environmentkitaspect.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/runcontrol.h> #include <projectexplorer/target.h> diff --git a/src/plugins/perfprofiler/perfprofilertool.cpp b/src/plugins/perfprofiler/perfprofilertool.cpp index 8c3698b3bd7..731b5f0c7c9 100644 --- a/src/plugins/perfprofiler/perfprofilertool.cpp +++ b/src/plugins/perfprofiler/perfprofilertool.cpp @@ -20,11 +20,11 @@ #include <debugger/analyzer/analyzermanager.h> #include <debugger/debuggericons.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/project.h> #include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectmanager.h> +#include <projectexplorer/sysrootkitaspect.h> #include <projectexplorer/runcontrol.h> #include <projectexplorer/target.h> diff --git a/src/plugins/perfprofiler/perfsettings.cpp b/src/plugins/perfprofiler/perfsettings.cpp index 2cf1f9e14d9..8192b464b67 100644 --- a/src/plugins/perfprofiler/perfsettings.cpp +++ b/src/plugins/perfprofiler/perfsettings.cpp @@ -11,9 +11,9 @@ #include <coreplugin/icore.h> #include <coreplugin/messagebox.h> +#include <projectexplorer/devicesupport/devicekitaspects.h> #include <projectexplorer/devicesupport/idevice.h> #include <projectexplorer/kit.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 b219e8ed7b8..331c0ea6d33 100644 --- a/src/plugins/perfprofiler/perftracepointdialog.cpp +++ b/src/plugins/perfprofiler/perftracepointdialog.cpp @@ -4,8 +4,8 @@ #include "perfprofilertr.h" #include "perftracepointdialog.h" +#include <projectexplorer/devicesupport/devicekitaspects.h> #include <projectexplorer/devicesupport/devicemanager.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 5ee0019a6b6..c98db1a5cad 100644 --- a/src/plugins/projectexplorer/CMakeLists.txt +++ b/src/plugins/projectexplorer/CMakeLists.txt @@ -73,6 +73,7 @@ add_qtc_plugin(ProjectExplorer editorsettingspropertiespage.cpp editorsettingspropertiespage.h environmentaspect.cpp environmentaspect.h environmentaspectwidget.cpp environmentaspectwidget.h + environmentkitaspect.cpp environmentkitaspect.h environmentwidget.cpp environmentwidget.h expanddata.cpp expanddata.h extraabi.cpp extraabi.h @@ -104,7 +105,6 @@ add_qtc_plugin(ProjectExplorer jsonwizard/jsonwizardscannergenerator.cpp jsonwizard/jsonwizardscannergenerator.h kit.cpp kit.h kitaspect.cpp kitaspect.h - kitaspects.cpp kitaspects.h kitchooser.cpp kitchooser.h kitfeatureprovider.h kitmanager.cpp kitmanager.h @@ -162,6 +162,7 @@ add_qtc_plugin(ProjectExplorer showineditortaskhandler.cpp showineditortaskhandler.h showoutputtaskhandler.cpp showoutputtaskhandler.h simpleprojectwizard.cpp simpleprojectwizard.h + sysrootkitaspect.cpp sysrootkitaspect.h target.cpp target.h targetsettingspanel.cpp targetsettingspanel.h targetsetuppage.cpp targetsetuppage.h diff --git a/src/plugins/projectexplorer/buildaspects.cpp b/src/plugins/projectexplorer/buildaspects.cpp index e62a5bb3d5f..dfaf86205dd 100644 --- a/src/plugins/projectexplorer/buildaspects.cpp +++ b/src/plugins/projectexplorer/buildaspects.cpp @@ -5,8 +5,8 @@ #include "buildconfiguration.h" #include "buildpropertiessettings.h" +#include "devicesupport/devicekitaspects.h" #include "devicesupport/idevice.h" -#include "kitaspects.h" #include "projectexplorerconstants.h" #include "projectexplorer.h" #include "projectexplorersettings.h" diff --git a/src/plugins/projectexplorer/buildconfiguration.cpp b/src/plugins/projectexplorer/buildconfiguration.cpp index e309c3826ac..9f2e3b32fda 100644 --- a/src/plugins/projectexplorer/buildconfiguration.cpp +++ b/src/plugins/projectexplorer/buildconfiguration.cpp @@ -10,9 +10,9 @@ #include "buildstepspage.h" #include "buildsystem.h" #include "customparser.h" +#include "devicesupport/devicekitaspects.h" #include "environmentwidget.h" #include "kit.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 7d801bc2690..554c9d55cc8 100644 --- a/src/plugins/projectexplorer/buildmanager.cpp +++ b/src/plugins/projectexplorer/buildmanager.cpp @@ -7,9 +7,9 @@ #include "buildsystem.h" #include "compileoutputwindow.h" #include "deployconfiguration.h" +#include "devicesupport/devicekitaspects.h" #include "devicesupport/devicemanager.h" #include "kit.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 9b0f6836aef..a45d6189159 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 "kitaspects.h" +#include "devicesupport/devicekitaspects.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 1ea0465f5e8..9789af02bc3 100644 --- a/src/plugins/projectexplorer/deployconfiguration.cpp +++ b/src/plugins/projectexplorer/deployconfiguration.cpp @@ -6,7 +6,7 @@ #include "buildconfiguration.h" #include "buildsteplist.h" #include "deploymentdataview.h" -#include "kitaspects.h" +#include "devicesupport/devicekitaspects.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 7f2989876ec..d70b6b50752 100644 --- a/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.cpp +++ b/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.cpp @@ -4,10 +4,10 @@ #include "devicecheckbuildstep.h" #include "../buildstep.h" -#include "../kitaspects.h" #include "../projectexplorerconstants.h" #include "../projectexplorertr.h" +#include "devicekitaspects.h" #include "devicemanager.h" #include "idevicefactory.h" diff --git a/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.cpp b/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.cpp index 4321ba2e277..c0154db77d1 100644 --- a/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.cpp +++ b/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.cpp @@ -3,9 +3,9 @@ #include "deviceprocessesdialog.h" +#include "devicekitaspects.h" #include "idevice.h" #include "processlist.h" -#include "../kitaspects.h" #include "../kitchooser.h" #include "../projectexplorertr.h" diff --git a/src/plugins/projectexplorer/devicesupport/idevice.cpp b/src/plugins/projectexplorer/devicesupport/idevice.cpp index 860c271a5a7..94baa513daf 100644 --- a/src/plugins/projectexplorer/devicesupport/idevice.cpp +++ b/src/plugins/projectexplorer/devicesupport/idevice.cpp @@ -3,12 +3,12 @@ #include "idevice.h" +#include "devicekitaspects.h" #include "devicemanager.h" #include "idevicefactory.h" #include "sshparameters.h" #include "../kit.h" -#include "../kitaspects.h" #include "../projectexplorericons.h" #include "../projectexplorertr.h" #include "../target.h" @@ -18,6 +18,7 @@ #include <utils/commandline.h> #include <utils/devicefileaccess.h> #include <utils/displayname.h> +#include <utils/environment.h> #include <utils/icon.h> #include <utils/portlist.h> #include <utils/qtcassert.h> diff --git a/src/plugins/projectexplorer/kitaspects.cpp b/src/plugins/projectexplorer/environmentkitaspect.cpp index a37c172f17e..19b56be9cc0 100644 --- a/src/plugins/projectexplorer/kitaspects.cpp +++ b/src/plugins/projectexplorer/environmentkitaspect.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 "kitaspects.h" +#include "environmentkitaspect.h" #include "projectexplorertr.h" #include "kit.h" @@ -30,160 +30,6 @@ using namespace Utils; namespace ProjectExplorer { -// -------------------------------------------------------------------------- -// SysRootKitAspect: -// -------------------------------------------------------------------------- - -namespace Internal { -class SysRootKitAspectImpl : public KitAspect -{ -public: - SysRootKitAspectImpl(Kit *k, const KitAspectFactory *factory) : KitAspect(k, factory) - { - m_chooser = createSubWidget<PathChooser>(); - m_chooser->setExpectedKind(PathChooser::ExistingDirectory); - m_chooser->setHistoryCompleter("PE.SysRoot.History"); - m_chooser->setFilePath(SysRootKitAspect::sysRoot(k)); - connect(m_chooser, &PathChooser::textChanged, - this, &SysRootKitAspectImpl::pathWasChanged); - } - - ~SysRootKitAspectImpl() override { delete m_chooser; } - -private: - void makeReadOnly() override { m_chooser->setReadOnly(true); } - - void addToInnerLayout(Layouting::Layout &layout) override - { - addMutableAction(m_chooser); - layout.addItem(Layouting::Span(2, m_chooser)); - } - - void refresh() override - { - if (!m_ignoreChanges.isLocked()) - m_chooser->setFilePath(SysRootKitAspect::sysRoot(kit())); - } - - void pathWasChanged() - { - const GuardLocker locker(m_ignoreChanges); - SysRootKitAspect::setSysRoot(kit(), m_chooser->filePath()); - } - - PathChooser *m_chooser; - Guard m_ignoreChanges; -}; - -class SysRootKitAspectFactory : public KitAspectFactory -{ -public: - SysRootKitAspectFactory(); - - Tasks validate(const Kit *k) const override; - KitAspect *createKitAspect(Kit *k) const override; - ItemList toUserOutput(const Kit *k) const override; - void addToMacroExpander(Kit *kit, MacroExpander *expander) const override; -}; - -SysRootKitAspectFactory::SysRootKitAspectFactory() -{ - setId(SysRootKitAspect::id()); - setDisplayName(Tr::tr("Sysroot")); - setDescription(Tr::tr("The root directory of the system image to use.<br>" - "Leave empty when building for the desktop.")); - setPriority(27000); -} - -Tasks SysRootKitAspectFactory::validate(const Kit *k) const -{ - Tasks result; - const FilePath dir = SysRootKitAspect::sysRoot(k); - if (dir.isEmpty()) - return result; - - if (dir.startsWith("target:") || dir.startsWith("remote:")) - return result; - - if (!dir.exists()) { - result << BuildSystemTask(Task::Warning, - Tr::tr("Sys Root \"%1\" does not exist in the file system.").arg(dir.toUserOutput())); - } else if (!dir.isDir()) { - result << BuildSystemTask(Task::Warning, - Tr::tr("Sys Root \"%1\" is not a directory.").arg(dir.toUserOutput())); - } else if (dir.dirEntries(QDir::AllEntries | QDir::NoDotAndDotDot).isEmpty()) { - result << BuildSystemTask(Task::Warning, - Tr::tr("Sys Root \"%1\" is empty.").arg(dir.toUserOutput())); - } - return result; -} - -KitAspect *SysRootKitAspectFactory::createKitAspect(Kit *k) const -{ - QTC_ASSERT(k, return nullptr); - - return new Internal::SysRootKitAspectImpl(k, this); -} - -KitAspectFactory::ItemList SysRootKitAspectFactory::toUserOutput(const Kit *k) const -{ - return {{Tr::tr("Sys Root"), SysRootKitAspect::sysRoot(k).toUserOutput()}}; -} - -void SysRootKitAspectFactory::addToMacroExpander(Kit *kit, MacroExpander *expander) const -{ - QTC_ASSERT(kit, return); - - expander->registerFileVariables("SysRoot", Tr::tr("Sys Root"), [kit] { - return SysRootKitAspect::sysRoot(kit); - }); -} - -const SysRootKitAspectFactory theSyRootKitAspectFactory; - -} // namespace Internal - -Id SysRootKitAspect::id() -{ - return "PE.Profile.SysRoot"; -} - -FilePath SysRootKitAspect::sysRoot(const Kit *k) -{ - if (!k) - return {}; - - if (!k->value(SysRootKitAspect::id()).toString().isEmpty()) - return FilePath::fromSettings(k->value(SysRootKitAspect::id())); - - for (Toolchain *tc : ToolchainKitAspect::toolChains(k)) { - if (!tc->sysRoot().isEmpty()) - return FilePath::fromString(tc->sysRoot()); - } - return {}; -} - -void SysRootKitAspect::setSysRoot(Kit *k, const FilePath &v) -{ - if (!k) - return; - - for (Toolchain *tc : ToolchainKitAspect::toolChains(k)) { - if (!tc->sysRoot().isEmpty()) { - // It's the sysroot from toolchain, don't set it. - if (tc->sysRoot() == v.toString()) - return; - - // We've changed the default toolchain sysroot, set it. - break; - } - } - k->setValue(SysRootKitAspect::id(), v.toString()); -} - -// -------------------------------------------------------------------------- -// EnvironmentKitAspect: -// -------------------------------------------------------------------------- static EnvironmentItem forceMSVCEnglishItem() { static EnvironmentItem item("VSLANG", "1033"); @@ -281,7 +127,6 @@ private: QCheckBox *m_vslangCheckbox; QWidget *m_mainWidget; }; -} // namespace Internal class EnvironmentKitAspectFactory : public KitAspectFactory { @@ -333,8 +178,8 @@ void EnvironmentKitAspectFactory::fix(Kit *k) void EnvironmentKitAspectFactory::addToBuildEnvironment(const Kit *k, Environment &env) const { const QStringList values - = transform(EnvironmentItem::toStringList(EnvironmentKitAspect::environmentChanges(k)), - [k](const QString &v) { return k->macroExpander()->expand(v); }); + = transform(EnvironmentItem::toStringList(EnvironmentKitAspect::environmentChanges(k)), + [k](const QString &v) { return k->macroExpander()->expand(v); }); env.modify(EnvironmentItem::fromStringList(values)); } @@ -352,9 +197,13 @@ KitAspect *EnvironmentKitAspectFactory::createKitAspect(Kit *k) const KitAspectFactory::ItemList EnvironmentKitAspectFactory::toUserOutput(const Kit *k) const { return {{Tr::tr("Environment"), - EnvironmentItem::toStringList(EnvironmentKitAspect::environmentChanges(k)).join("<br>")}}; + EnvironmentItem::toStringList(EnvironmentKitAspect::environmentChanges(k)).join("<br>")}}; } +const EnvironmentKitAspectFactory theEnvironmentKitAspectFactory; + +} // namespace Internal + Id EnvironmentKitAspect::id() { return "PE.Profile.Environment"; @@ -373,6 +222,4 @@ void EnvironmentKitAspect::setEnvironmentChanges(Kit *k, const EnvironmentItems k->setValue(EnvironmentKitAspect::id(), EnvironmentItem::toStringList(changes)); } -const EnvironmentKitAspectFactory theEnvironmentKitAspectFactory; - } // namespace ProjectExplorer diff --git a/src/plugins/projectexplorer/kitaspects.h b/src/plugins/projectexplorer/environmentkitaspect.h index 1c9b785a744..b7ebc155576 100644 --- a/src/plugins/projectexplorer/kitaspects.h +++ b/src/plugins/projectexplorer/environmentkitaspect.h @@ -3,24 +3,14 @@ #pragma once -#include "abi.h" -#include "devicesupport/devicekitaspects.h" -#include "toolchainkitaspect.h" +#include "projectexplorer_export.h" -#include <utils/environment.h> +#include <utils/environmentfwd.h> + +namespace Utils { class Id; } namespace ProjectExplorer { class Kit; -class Toolchain; -class ToolchainBundle; - -class PROJECTEXPLORER_EXPORT SysRootKitAspect -{ -public: - static Utils::Id id(); - static Utils::FilePath sysRoot(const Kit *k); - static void setSysRoot(Kit *k, const Utils::FilePath &v); -}; class PROJECTEXPLORER_EXPORT EnvironmentKitAspect { diff --git a/src/plugins/projectexplorer/extracompiler.cpp b/src/plugins/projectexplorer/extracompiler.cpp index 59531898a1c..e72ce3772dd 100644 --- a/src/plugins/projectexplorer/extracompiler.cpp +++ b/src/plugins/projectexplorer/extracompiler.cpp @@ -4,7 +4,7 @@ #include "extracompiler.h" #include "buildmanager.h" -#include "kitaspects.h" +#include "environmentkitaspect.h" #include "projectmanager.h" #include "target.h" diff --git a/src/plugins/projectexplorer/kit.cpp b/src/plugins/projectexplorer/kit.cpp index 25f420bdd9e..828e02eb084 100644 --- a/src/plugins/projectexplorer/kit.cpp +++ b/src/plugins/projectexplorer/kit.cpp @@ -3,10 +3,10 @@ #include "kit.h" +#include "devicesupport/devicekitaspects.h" #include "devicesupport/idevice.h" #include "devicesupport/idevicefactory.h" #include "kitaspect.h" -#include "kitaspects.h" #include "kitmanager.h" #include "ioutputparser.h" #include "osparser.h" diff --git a/src/plugins/projectexplorer/kitaspect.cpp b/src/plugins/projectexplorer/kitaspect.cpp index bcfced094c4..c8fabb17792 100644 --- a/src/plugins/projectexplorer/kitaspect.cpp +++ b/src/plugins/projectexplorer/kitaspect.cpp @@ -3,8 +3,8 @@ #include "kitaspect.h" +#include "devicesupport/devicekitaspects.h" #include "kit.h" -#include "kitaspects.h" #include "projectexplorertr.h" #include <coreplugin/icore.h> diff --git a/src/plugins/projectexplorer/kitmanager.cpp b/src/plugins/projectexplorer/kitmanager.cpp index 563cf19b0a7..b2754fa47f3 100644 --- a/src/plugins/projectexplorer/kitmanager.cpp +++ b/src/plugins/projectexplorer/kitmanager.cpp @@ -4,13 +4,14 @@ #include "kitmanager.h" #include "abi.h" +#include "devicesupport/devicekitaspects.h" #include "devicesupport/idevicefactory.h" #include "kit.h" #include "kitfeatureprovider.h" #include "kitaspect.h" -#include "kitaspects.h" #include "projectexplorerconstants.h" #include "projectexplorertr.h" +#include "toolchainkitaspect.h" #include "toolchainmanager.h" #include <coreplugin/icore.h> diff --git a/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp b/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp index 73c7dac7588..dd2014dca8c 100644 --- a/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp +++ b/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp @@ -3,10 +3,10 @@ #include "kitmanagerconfigwidget.h" +#include "devicesupport/devicekitaspects.h" #include "devicesupport/idevicefactory.h" #include "kit.h" #include "kitaspect.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 6a4db951059..c5fd71101e3 100644 --- a/src/plugins/projectexplorer/makestep.cpp +++ b/src/plugins/projectexplorer/makestep.cpp @@ -4,16 +4,17 @@ #include "makestep.h" #include "buildconfiguration.h" +#include "devicesupport/devicekitaspects.h" #include "devicesupport/idevice.h" #include "gnumakeparser.h" #include "kit.h" -#include "kitaspects.h" #include "processparameters.h" #include "projectexplorer.h" #include "projectexplorerconstants.h" #include "projectexplorertr.h" #include "target.h" #include "toolchain.h" +#include "toolchainkitaspect.h" #include <utils/aspects.h> #include <utils/environment.h> diff --git a/src/plugins/projectexplorer/parseissuesdialog.cpp b/src/plugins/projectexplorer/parseissuesdialog.cpp index af1d3928c25..290833045a6 100644 --- a/src/plugins/projectexplorer/parseissuesdialog.cpp +++ b/src/plugins/projectexplorer/parseissuesdialog.cpp @@ -3,11 +3,11 @@ #include "parseissuesdialog.h" -#include "kitaspects.h" +#include "devicesupport/devicekitaspects.h" #include "kitchooser.h" #include "kitmanager.h" -#include "projectexplorerconstants.h" #include "projectexplorertr.h" +#include "projectexplorerconstants.h" #include "taskhub.h" #include <utils/fileutils.h> diff --git a/src/plugins/projectexplorer/project.cpp b/src/plugins/projectexplorer/project.cpp index 1400e8e86ba..2385a7d4c13 100644 --- a/src/plugins/projectexplorer/project.cpp +++ b/src/plugins/projectexplorer/project.cpp @@ -7,10 +7,10 @@ #include "buildinfo.h" #include "buildsystem.h" #include "deployconfiguration.h" +#include "devicesupport/devicekitaspects.h" #include "editorconfiguration.h" #include "environmentaspect.h" #include "kit.h" -#include "kitaspects.h" #include "msvctoolchain.h" #include "projectexplorer.h" #include "projectexplorerconstants.h" @@ -21,6 +21,7 @@ #include "runconfigurationaspects.h" #include "target.h" #include "taskhub.h" +#include "toolchainkitaspect.h" #include "toolchainmanager.h" #include "userfileaccessor.h" diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index bc0e95c2a18..6d3ca9fb772 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -36,6 +36,7 @@ #include "devicesupport/desktopdevice.h" #include "devicesupport/desktopdevicefactory.h" #include "devicesupport/devicecheckbuildstep.h" +#include "devicesupport/devicekitaspects.h" #include "devicesupport/devicemanager.h" #include "devicesupport/devicesettingspage.h" #include "devicesupport/sshsettings.h" @@ -49,7 +50,6 @@ #include "jsonwizard/jsonwizardscannergenerator.h" #include "jsonwizard/jsonwizardpagefactory_p.h" #include "kitfeatureprovider.h" -#include "kitaspects.h" #include "kitmanager.h" #include "miniprojecttargetselector.h" #include "namedwidget.h" diff --git a/src/plugins/projectexplorer/projectexplorer.qbs b/src/plugins/projectexplorer/projectexplorer.qbs index dc2547cf1f9..8ce76b16010 100644 --- a/src/plugins/projectexplorer/projectexplorer.qbs +++ b/src/plugins/projectexplorer/projectexplorer.qbs @@ -61,6 +61,7 @@ QtcPlugin { "editorsettingspropertiespage.cpp", "editorsettingspropertiespage.h", "environmentaspect.cpp", "environmentaspect.h", "environmentaspectwidget.cpp", "environmentaspectwidget.h", + "environmentkitaspect.cpp", "environmentkitaspect.h", "environmentwidget.cpp", "environmentwidget.h", "expanddata.cpp", "expanddata.h", "extraabi.cpp", "extraabi.h", @@ -77,7 +78,6 @@ QtcPlugin { "itaskhandler.h", "kit.cpp", "kit.h", "kitaspect.cpp", "kitaspect.h", - "kitaspects.cpp", "kitaspects.h", "kitchooser.cpp", "kitchooser.h", "kitfeatureprovider.h", "kitmanager.cpp", "kitmanager.h", @@ -135,6 +135,7 @@ QtcPlugin { "showineditortaskhandler.cpp", "showineditortaskhandler.h", "showoutputtaskhandler.cpp", "showoutputtaskhandler.h", "simpleprojectwizard.cpp", "simpleprojectwizard.h", + "sysrootkitaspect.cpp", "sysrootkitaspect.h", "target.cpp", "target.h", "targetsettingspanel.cpp", "targetsettingspanel.h", "targetsetuppage.cpp", "targetsetuppage.h", diff --git a/src/plugins/projectexplorer/projectimporter.cpp b/src/plugins/projectexplorer/projectimporter.cpp index 239f27e89b9..a4c7df4e61b 100644 --- a/src/plugins/projectexplorer/projectimporter.cpp +++ b/src/plugins/projectexplorer/projectimporter.cpp @@ -4,13 +4,14 @@ #include "projectimporter.h" #include "buildinfo.h" +#include "devicesupport/devicekitaspects.h" #include "kit.h" -#include "kitaspects.h" #include "kitmanager.h" #include "projectexplorerconstants.h" #include "projectexplorertr.h" #include "target.h" #include "toolchain.h" +#include "toolchainkitaspect.h" #include "toolchainmanager.h" #include <coreplugin/icore.h> diff --git a/src/plugins/projectexplorer/rawprojectpart.cpp b/src/plugins/projectexplorer/rawprojectpart.cpp index bad242f5380..0825b6b6914 100644 --- a/src/plugins/projectexplorer/rawprojectpart.cpp +++ b/src/plugins/projectexplorer/rawprojectpart.cpp @@ -6,9 +6,11 @@ #include "abi.h" #include "buildconfiguration.h" #include "buildsystem.h" -#include "kitaspects.h" +#include "devicesupport/devicekitaspects.h" #include "project.h" #include "target.h" +#include "sysrootkitaspect.h" +#include "toolchainkitaspect.h" #include <ios/iosconstants.h> diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp index e1490c6d3b3..22c6282c698 100644 --- a/src/plugins/projectexplorer/runconfiguration.cpp +++ b/src/plugins/projectexplorer/runconfiguration.cpp @@ -5,8 +5,8 @@ #include "buildconfiguration.h" #include "buildsystem.h" +#include "devicesupport/devicekitaspects.h" #include "environmentaspect.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 965131465a8..138e740c724 100644 --- a/src/plugins/projectexplorer/runconfigurationaspects.cpp +++ b/src/plugins/projectexplorer/runconfigurationaspects.cpp @@ -3,10 +3,10 @@ #include "runconfigurationaspects.h" +#include "devicesupport/devicekitaspects.h" #include "devicesupport/devicemanager.h" #include "devicesupport/idevice.h" #include "environmentaspect.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 605f255d81b..6fef5669272 100644 --- a/src/plugins/projectexplorer/runcontrol.cpp +++ b/src/plugins/projectexplorer/runcontrol.cpp @@ -6,13 +6,13 @@ #include "appoutputpane.h" #include "buildconfiguration.h" #include "customparser.h" +#include "devicesupport/devicekitaspects.h" #include "devicesupport/devicemanager.h" #include "devicesupport/deviceusedportsgatherer.h" #include "devicesupport/idevice.h" #include "devicesupport/idevicefactory.h" #include "devicesupport/sshparameters.h" #include "devicesupport/sshsettings.h" -#include "kitaspects.h" #include "project.h" #include "projectexplorer.h" #include "projectexplorerconstants.h" diff --git a/src/plugins/projectexplorer/sysrootkitaspect.cpp b/src/plugins/projectexplorer/sysrootkitaspect.cpp new file mode 100644 index 00000000000..32013226dbb --- /dev/null +++ b/src/plugins/projectexplorer/sysrootkitaspect.cpp @@ -0,0 +1,168 @@ +// Copyright (C) 2024 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + +#include "sysrootkitaspect.h" + +#include "kit.h" +#include "kitaspect.h" +#include "projectexplorertr.h" +#include "toolchain.h" +#include "toolchainkitaspect.h" + +#include <utils/filepath.h> +#include <utils/guard.h> +#include <utils/id.h> +#include <utils/layoutbuilder.h> +#include <utils/macroexpander.h> + +using namespace Utils; + +namespace ProjectExplorer { +namespace Internal { +class SysRootKitAspectImpl : public KitAspect +{ +public: + SysRootKitAspectImpl(Kit *k, const KitAspectFactory *factory) : KitAspect(k, factory) + { + m_chooser = createSubWidget<PathChooser>(); + m_chooser->setExpectedKind(PathChooser::ExistingDirectory); + m_chooser->setHistoryCompleter("PE.SysRoot.History"); + m_chooser->setFilePath(SysRootKitAspect::sysRoot(k)); + connect(m_chooser, &PathChooser::textChanged, + this, &SysRootKitAspectImpl::pathWasChanged); + } + + ~SysRootKitAspectImpl() override { delete m_chooser; } + +private: + void makeReadOnly() override { m_chooser->setReadOnly(true); } + + void addToInnerLayout(Layouting::Layout &layout) override + { + addMutableAction(m_chooser); + layout.addItem(Layouting::Span(2, m_chooser)); + } + + void refresh() override + { + if (!m_ignoreChanges.isLocked()) + m_chooser->setFilePath(SysRootKitAspect::sysRoot(kit())); + } + + void pathWasChanged() + { + const GuardLocker locker(m_ignoreChanges); + SysRootKitAspect::setSysRoot(kit(), m_chooser->filePath()); + } + + PathChooser *m_chooser; + Guard m_ignoreChanges; +}; + +class SysRootKitAspectFactory : public KitAspectFactory +{ +public: + SysRootKitAspectFactory(); + + Tasks validate(const Kit *k) const override; + KitAspect *createKitAspect(Kit *k) const override; + ItemList toUserOutput(const Kit *k) const override; + void addToMacroExpander(Kit *kit, MacroExpander *expander) const override; +}; + +SysRootKitAspectFactory::SysRootKitAspectFactory() +{ + setId(SysRootKitAspect::id()); + setDisplayName(Tr::tr("Sysroot")); + setDescription(Tr::tr("The root directory of the system image to use.<br>" + "Leave empty when building for the desktop.")); + setPriority(27000); +} + +Tasks SysRootKitAspectFactory::validate(const Kit *k) const +{ + Tasks result; + const FilePath dir = SysRootKitAspect::sysRoot(k); + if (dir.isEmpty()) + return result; + + if (dir.startsWith("target:") || dir.startsWith("remote:")) + return result; + + if (!dir.exists()) { + result << BuildSystemTask(Task::Warning, + Tr::tr("Sys Root \"%1\" does not exist in the file system.").arg(dir.toUserOutput())); + } else if (!dir.isDir()) { + result << BuildSystemTask(Task::Warning, + Tr::tr("Sys Root \"%1\" is not a directory.").arg(dir.toUserOutput())); + } else if (dir.dirEntries(QDir::AllEntries | QDir::NoDotAndDotDot).isEmpty()) { + result << BuildSystemTask(Task::Warning, + Tr::tr("Sys Root \"%1\" is empty.").arg(dir.toUserOutput())); + } + return result; +} + +KitAspect *SysRootKitAspectFactory::createKitAspect(Kit *k) const +{ + QTC_ASSERT(k, return nullptr); + + return new Internal::SysRootKitAspectImpl(k, this); +} + +KitAspectFactory::ItemList SysRootKitAspectFactory::toUserOutput(const Kit *k) const +{ + return {{Tr::tr("Sys Root"), SysRootKitAspect::sysRoot(k).toUserOutput()}}; +} + +void SysRootKitAspectFactory::addToMacroExpander(Kit *kit, MacroExpander *expander) const +{ + QTC_ASSERT(kit, return); + + expander->registerFileVariables("SysRoot", Tr::tr("Sys Root"), [kit] { + return SysRootKitAspect::sysRoot(kit); + }); +} + +const SysRootKitAspectFactory theSyRootKitAspectFactory; + +} // namespace Internal + +Id SysRootKitAspect::id() +{ + return "PE.Profile.SysRoot"; +} + +FilePath SysRootKitAspect::sysRoot(const Kit *k) +{ + if (!k) + return {}; + + if (!k->value(SysRootKitAspect::id()).toString().isEmpty()) + return FilePath::fromSettings(k->value(SysRootKitAspect::id())); + + for (Toolchain *tc : ToolchainKitAspect::toolChains(k)) { + if (!tc->sysRoot().isEmpty()) + return FilePath::fromString(tc->sysRoot()); + } + return {}; +} + +void SysRootKitAspect::setSysRoot(Kit *k, const FilePath &v) +{ + if (!k) + return; + + for (Toolchain *tc : ToolchainKitAspect::toolChains(k)) { + if (!tc->sysRoot().isEmpty()) { + // It's the sysroot from toolchain, don't set it. + if (tc->sysRoot() == v.toString()) + return; + + // We've changed the default toolchain sysroot, set it. + break; + } + } + k->setValue(SysRootKitAspect::id(), v.toString()); +} + +} // namespace ProjectExplorer diff --git a/src/plugins/projectexplorer/sysrootkitaspect.h b/src/plugins/projectexplorer/sysrootkitaspect.h new file mode 100644 index 00000000000..86dcb390a21 --- /dev/null +++ b/src/plugins/projectexplorer/sysrootkitaspect.h @@ -0,0 +1,24 @@ +// Copyright (C) 2024 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + +#pragma once + +#include "projectexplorer_export.h" + +namespace Utils { +class FilePath; +class Id; +} // namespace Utils + +namespace ProjectExplorer { +class Kit; + +class PROJECTEXPLORER_EXPORT SysRootKitAspect +{ +public: + static Utils::Id id(); + static Utils::FilePath sysRoot(const Kit *k); + static void setSysRoot(Kit *k, const Utils::FilePath &v); +}; + +} // namespace ProjectExplorer diff --git a/src/plugins/projectexplorer/target.cpp b/src/plugins/projectexplorer/target.cpp index eb6105273b6..42c52c17018 100644 --- a/src/plugins/projectexplorer/target.cpp +++ b/src/plugins/projectexplorer/target.cpp @@ -10,9 +10,9 @@ #include "buildtargetinfo.h" #include "deployconfiguration.h" #include "deploymentdata.h" +#include "devicesupport/devicekitaspects.h" #include "devicesupport/devicemanager.h" #include "kit.h" -#include "kitaspects.h" #include "kitmanager.h" #include "miniprojecttargetselector.h" #include "project.h" diff --git a/src/plugins/projectexplorer/toolchainkitaspect.cpp b/src/plugins/projectexplorer/toolchainkitaspect.cpp index cd8db8f27b1..77ea6a6981b 100644 --- a/src/plugins/projectexplorer/toolchainkitaspect.cpp +++ b/src/plugins/projectexplorer/toolchainkitaspect.cpp @@ -3,10 +3,10 @@ #include "toolchainkitaspect.h" +#include "devicesupport/devicekitaspects.h" #include "devicesupport/idevice.h" #include "kit.h" #include "kitaspect.h" -#include "kitaspects.h" #include "kitmanager.h" #include "projectexplorerconstants.h" #include "projectexplorertr.h" diff --git a/src/plugins/python/pythonsettings.cpp b/src/plugins/python/pythonsettings.cpp index 49091b886c9..58e5d11f81b 100644 --- a/src/plugins/python/pythonsettings.cpp +++ b/src/plugins/python/pythonsettings.cpp @@ -13,7 +13,7 @@ #include <coreplugin/progressmanager/processprogress.h> #include <projectexplorer/kitaspect.h> -#include <projectexplorer/kitaspects.h> +#include <projectexplorer/environmentkitaspect.h> #include <projectexplorer/kitmanager.h> #include <extensionsystem/pluginmanager.h> diff --git a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp index e64e8a51523..f3caa25d261 100644 --- a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp +++ b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp @@ -12,11 +12,13 @@ #include <baremetal/baremetalconstants.h> #include <ios/iosconstants.h> #include <projectexplorer/abi.h> +#include <projectexplorer/devicesupport/devicekitaspects.h> #include <projectexplorer/devicesupport/idevice.h> #include <projectexplorer/gcctoolchain.h> #include <projectexplorer/kit.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/toolchain.h> +#include <projectexplorer/sysrootkitaspect.h> +#include <projectexplorer/toolchainkitaspect.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/msvctoolchain.h> #include <qtsupport/baseqtversion.h> diff --git a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp index 9fe3a05895a..5bcce759105 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/kitaspects.h> +#include <projectexplorer/environmentkitaspect.h> #include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorertr.h> diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp index 7f865948d79..2a14b493ecd 100644 --- a/src/plugins/qbsprojectmanager/qbsproject.cpp +++ b/src/plugins/qbsprojectmanager/qbsproject.cpp @@ -32,7 +32,7 @@ #include <projectexplorer/deploymentdata.h> #include <projectexplorer/headerpath.h> #include <projectexplorer/kit.h> -#include <projectexplorer/kitaspects.h> +#include <projectexplorer/environmentkitaspect.h> #include <projectexplorer/kitmanager.h> #include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorerconstants.h> diff --git a/src/plugins/qbsprojectmanager/qbsprojectimporter.cpp b/src/plugins/qbsprojectmanager/qbsprojectimporter.cpp index 4e31b8d765c..8fdfd9d3c0d 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectimporter.cpp +++ b/src/plugins/qbsprojectmanager/qbsprojectimporter.cpp @@ -10,12 +10,13 @@ #include <coreplugin/documentmanager.h> #include <projectexplorer/buildconfiguration.h> #include <projectexplorer/buildinfo.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/kitmanager.h> #include <projectexplorer/project.h> #include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorerconstants.h> +#include <projectexplorer/sysrootkitaspect.h> #include <projectexplorer/toolchain.h> +#include <projectexplorer/toolchainkitaspect.h> #include <qtsupport/qtkitaspect.h> #include <utils/algorithm.h> #include <utils/filepath.h> diff --git a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp index 5eac58e8087..ab6454e05c0 100644 --- a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp +++ b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp @@ -24,14 +24,16 @@ #include <projectexplorer/buildmanager.h> #include <projectexplorer/buildpropertiessettings.h> #include <projectexplorer/buildsteplist.h> +#include <projectexplorer/devicesupport/devicekitaspects.h> #include <projectexplorer/kit.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/makestep.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorertr.h> #include <projectexplorer/runconfiguration.h> +#include <projectexplorer/sysrootkitaspect.h> #include <projectexplorer/target.h> #include <projectexplorer/toolchain.h> +#include <projectexplorer/toolchainkitaspect.h> #include <qtsupport/qtbuildaspects.h> #include <qtsupport/qtkitaspect.h> diff --git a/src/plugins/qmakeprojectmanager/qmakekitaspect.cpp b/src/plugins/qmakeprojectmanager/qmakekitaspect.cpp index 34d7ddfbd3b..dbe3c559798 100644 --- a/src/plugins/qmakeprojectmanager/qmakekitaspect.cpp +++ b/src/plugins/qmakeprojectmanager/qmakekitaspect.cpp @@ -7,9 +7,9 @@ #include "qmakeprojectmanagertr.h" #include <projectexplorer/kitaspect.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/toolchain.h> +#include <projectexplorer/toolchainkitaspect.h> #include <projectexplorer/toolchainmanager.h> #include <qtsupport/qtkitaspect.h> diff --git a/src/plugins/qmakeprojectmanager/qmakemakestep.cpp b/src/plugins/qmakeprojectmanager/qmakemakestep.cpp index ae8b370b778..1f5a292467a 100644 --- a/src/plugins/qmakeprojectmanager/qmakemakestep.cpp +++ b/src/plugins/qmakeprojectmanager/qmakemakestep.cpp @@ -14,12 +14,12 @@ #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/target.h> #include <projectexplorer/toolchain.h> +#include <projectexplorer/toolchainkitaspect.h> #include <projectexplorer/xcodebuildparser.h> #include <utils/qtcprocess.h> diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp index 150851f7adc..fd0a65f6373 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp @@ -25,19 +25,21 @@ #include <projectexplorer/buildsteplist.h> #include <projectexplorer/buildtargetinfo.h> #include <projectexplorer/deploymentdata.h> +#include <projectexplorer/devicesupport/devicekitaspects.h> #include <projectexplorer/devicesupport/idevice.h> #include <projectexplorer/extracompiler.h> #include <projectexplorer/headerpath.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/kitmanager.h> #include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectupdater.h> #include <projectexplorer/rawprojectpart.h> #include <projectexplorer/runconfiguration.h> +#include <projectexplorer/sysrootkitaspect.h> #include <projectexplorer/target.h> #include <projectexplorer/taskhub.h> #include <projectexplorer/toolchain.h> +#include <projectexplorer/toolchainkitaspect.h> #include <projectexplorer/toolchainmanager.h> #include <proparser/qmakevfs.h> diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp b/src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp index 220e18a12ea..2e85cb71911 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp @@ -12,10 +12,10 @@ #include "qmakestep.h" #include <projectexplorer/buildinfo.h> -#include <projectexplorer/projectexplorerconstants.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/kitmanager.h> +#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/toolchain.h> +#include <projectexplorer/toolchainkitaspect.h> #include <projectexplorer/toolchainmanager.h> #include <qtsupport/qtkitaspect.h> diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp index e94a2678e45..1f34696df15 100644 --- a/src/plugins/qmakeprojectmanager/qmakestep.cpp +++ b/src/plugins/qmakeprojectmanager/qmakestep.cpp @@ -16,15 +16,17 @@ #include <projectexplorer/buildmanager.h> #include <projectexplorer/buildsteplist.h> +#include <projectexplorer/devicesupport/devicekitaspects.h> #include <projectexplorer/gnumakeparser.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/makestep.h> #include <projectexplorer/processparameters.h> #include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/runconfigurationaspects.h> +#include <projectexplorer/sysrootkitaspect.h> #include <projectexplorer/target.h> #include <projectexplorer/toolchain.h> +#include <projectexplorer/toolchainkitaspect.h> #include <coreplugin/icore.h> #include <coreplugin/icontext.h> diff --git a/src/plugins/qmakeprojectmanager/wizards/qtwizard.cpp b/src/plugins/qmakeprojectmanager/wizards/qtwizard.cpp index c76e0be174c..a4493d6361d 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/kitaspects.h> +#include <projectexplorer/environmentkitaspect.h> #include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projecttree.h> diff --git a/src/plugins/qmldesigner/components/toolbar/toolbarbackend.cpp b/src/plugins/qmldesigner/components/toolbar/toolbarbackend.cpp index e30545387f9..3c76b93c9c6 100644 --- a/src/plugins/qmldesigner/components/toolbar/toolbarbackend.cpp +++ b/src/plugins/qmldesigner/components/toolbar/toolbarbackend.cpp @@ -27,7 +27,7 @@ #include <texteditor/textdocument.h> -#include <projectexplorer/kitaspects.h> +#include <projectexplorer/devicesupport/devicekitaspects.h> #include <projectexplorer/kitmanager.h> #include <projectexplorer/project.h> #include <projectexplorer/projectexplorer.h> diff --git a/src/plugins/qmldesigner/qmlpreviewplugin/qmlpreviewactions.cpp b/src/plugins/qmldesigner/qmlpreviewplugin/qmlpreviewactions.cpp index 93a03772103..b7af3845e26 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/kitaspects.h> +#include <projectexplorer/devicesupport/devicekitaspects.h> #include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectmanager.h> diff --git a/src/plugins/qmljstools/qmljsmodelmanager.cpp b/src/plugins/qmljstools/qmljsmodelmanager.cpp index 71fd60cbc31..b724566c567 100644 --- a/src/plugins/qmljstools/qmljsmodelmanager.cpp +++ b/src/plugins/qmljstools/qmljsmodelmanager.cpp @@ -16,7 +16,7 @@ #include <projectexplorer/buildconfiguration.h> #include <projectexplorer/buildsystem.h> -#include <projectexplorer/kitaspects.h> +#include <projectexplorer/environmentkitaspect.h> #include <projectexplorer/kitmanager.h> #include <projectexplorer/project.h> #include <projectexplorer/projectexplorerconstants.h> diff --git a/src/plugins/qmlpreview/qmlpreviewfileontargetfinder.cpp b/src/plugins/qmlpreview/qmlpreviewfileontargetfinder.cpp index 731b523b027..e1e2ca05f3e 100644 --- a/src/plugins/qmlpreview/qmlpreviewfileontargetfinder.cpp +++ b/src/plugins/qmlpreview/qmlpreviewfileontargetfinder.cpp @@ -3,8 +3,8 @@ #include "qmlpreviewfileontargetfinder.h" +#include <projectexplorer/devicesupport/devicekitaspects.h> #include <projectexplorer/deploymentdata.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 47e0589f5e3..c60225607a8 100644 --- a/src/plugins/qmlpreview/qmlpreviewplugin.cpp +++ b/src/plugins/qmlpreview/qmlpreviewplugin.cpp @@ -22,8 +22,8 @@ #include <extensionsystem/pluginmanager.h> +#include <projectexplorer/devicesupport/devicekitaspects.h> #include <projectexplorer/kit.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 37b96931ab2..ce4e834ef6b 100644 --- a/src/plugins/qmlprofiler/qmlprofilerattachdialog.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerattachdialog.cpp @@ -4,7 +4,7 @@ #include "qmlprofilerattachdialog.h" #include "qmlprofilertr.h" -#include <projectexplorer/kitaspects.h> +#include <projectexplorer/devicesupport/devicekitaspects.h> #include <projectexplorer/kitchooser.h> #include <QDialogButtonBox> diff --git a/src/plugins/qmlprofiler/qmlprofilerdetailsrewriter.cpp b/src/plugins/qmlprofiler/qmlprofilerdetailsrewriter.cpp index 5fb1f203ef6..04f8319f5b0 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/kitaspects.h> +#include <projectexplorer/environmentkitaspect.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 6faec4b4c23..c55ea64a345 100644 --- a/src/plugins/qmlprofiler/qmlprofilerplugin.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerplugin.cpp @@ -39,7 +39,7 @@ #include <extensionsystem/pluginmanager.h> #include <projectexplorer/environmentaspect.h> -#include <projectexplorer/kitaspects.h> +#include <projectexplorer/environmentkitaspect.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 2f7bfb488ff..43666ab5ff1 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/kitaspects.h> +#include <projectexplorer/environmentkitaspect.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorericons.h> #include <projectexplorer/qmldebugcommandlinearguments.h> diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp index da6bc556d7a..e7834d1209e 100644 --- a/src/plugins/qmlprofiler/qmlprofilertool.cpp +++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp @@ -33,9 +33,9 @@ #include <debugger/debuggericons.h> #include <debugger/debuggermainwindow.h> +#include <projectexplorer/devicesupport/devicekitaspects.h> #include <projectexplorer/devicesupport/idevice.h> #include <projectexplorer/environmentaspect.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 4539948be37..1aab728f4a4 100644 --- a/src/plugins/qmlprofiler/tests/qmlprofilerdetailsrewriter_test.cpp +++ b/src/plugins/qmlprofiler/tests/qmlprofilerdetailsrewriter_test.cpp @@ -6,11 +6,11 @@ #include <projectexplorer/buildconfiguration.h> #include <projectexplorer/buildinfo.h> #include <projectexplorer/customexecutablerunconfiguration.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/kitmanager.h> #include <projectexplorer/project.h> #include <projectexplorer/projectmanager.h> #include <projectexplorer/projectnodes.h> +#include <projectexplorer/sysrootkitaspect.h> #include <projectexplorer/target.h> #include <utils/filepath.h> diff --git a/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.cpp b/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.cpp index 80ff0532e2c..2eae7475c83 100644 --- a/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.cpp +++ b/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.cpp @@ -27,8 +27,8 @@ #include <extensionsystem/pluginspec.h> #include <projectexplorer/deploymentdata.h> +#include <projectexplorer/devicesupport/devicekitaspects.h> #include <projectexplorer/devicesupport/idevice.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/kitmanager.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectmanager.h> diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp index bdcf1837532..6e8cfd8a827 100644 --- a/src/plugins/qmlprojectmanager/qmlproject.cpp +++ b/src/plugins/qmlprojectmanager/qmlproject.cpp @@ -10,8 +10,8 @@ #include <coreplugin/icontext.h> #include <coreplugin/icore.h> +#include <projectexplorer/devicesupport/devicekitaspects.h> #include <projectexplorer/devicesupport/idevice.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/kitmanager.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectmanager.h> diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp index fd333c6f898..4fe33ae0579 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp @@ -15,9 +15,9 @@ #include <projectexplorer/buildsystem.h> #include <projectexplorer/deployconfiguration.h> +#include <projectexplorer/devicesupport/devicekitaspects.h> #include <projectexplorer/devicesupport/idevice.h> #include <projectexplorer/environmentaspect.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 27f2fa33ecb..aeffc7e5982 100644 --- a/src/plugins/qnx/qnxdebugsupport.cpp +++ b/src/plugins/qnx/qnxdebugsupport.cpp @@ -14,11 +14,11 @@ #include <debugger/debuggerruncontrol.h> #include <debugger/debuggertr.h> +#include <projectexplorer/devicesupport/devicekitaspects.h> #include <projectexplorer/devicesupport/deviceprocessesdialog.h> #include <projectexplorer/devicesupport/deviceusedportsgatherer.h> #include <projectexplorer/devicesupport/idevice.h> #include <projectexplorer/kit.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/kitchooser.h> #include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectmanager.h> diff --git a/src/plugins/qnx/qnxplugin.cpp b/src/plugins/qnx/qnxplugin.cpp index 8db9af65f14..5cb805f74fd 100644 --- a/src/plugins/qnx/qnxplugin.cpp +++ b/src/plugins/qnx/qnxplugin.cpp @@ -22,11 +22,12 @@ #include <projectexplorer/buildconfiguration.h> #include <projectexplorer/buildstep.h> #include <projectexplorer/deployconfiguration.h> -#include <projectexplorer/kitaspects.h> +#include <projectexplorer/devicesupport/devicekitaspects.h> #include <projectexplorer/kitmanager.h> #include <projectexplorer/project.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/target.h> +#include <projectexplorer/toolchainkitaspect.h> #include <remotelinux/remotelinux_constants.h> diff --git a/src/plugins/qnx/qnxsettingspage.cpp b/src/plugins/qnx/qnxsettingspage.cpp index 6d46b6c2c01..a5db2b60423 100644 --- a/src/plugins/qnx/qnxsettingspage.cpp +++ b/src/plugins/qnx/qnxsettingspage.cpp @@ -15,13 +15,16 @@ #include <debugger/debuggeritemmanager.h> #include <debugger/debuggerkitaspect.h> +#include <projectexplorer/devicesupport/devicekitaspects.h> #include <projectexplorer/devicesupport/devicemanager.h> #include <projectexplorer/kit.h> -#include <projectexplorer/kitaspects.h> +#include <projectexplorer/environmentkitaspect.h> #include <projectexplorer/kitmanager.h> #include <projectexplorer/projectexplorerconstants.h> +#include <projectexplorer/sysrootkitaspect.h> #include <projectexplorer/toolchainmanager.h> #include <projectexplorer/toolchain.h> +#include <projectexplorer/toolchainkitaspect.h> #include <qtsupport/baseqtversion.h> #include <qtsupport/qtversionmanager.h> diff --git a/src/plugins/qtapplicationmanager/appmanagercreatepackagestep.cpp b/src/plugins/qtapplicationmanager/appmanagercreatepackagestep.cpp index 7c6c31a6133..d918e24dc20 100644 --- a/src/plugins/qtapplicationmanager/appmanagercreatepackagestep.cpp +++ b/src/plugins/qtapplicationmanager/appmanagercreatepackagestep.cpp @@ -14,7 +14,7 @@ #include <projectexplorer/abstractprocessstep.h> #include <projectexplorer/buildstep.h> #include <projectexplorer/deployconfiguration.h> -#include <projectexplorer/kitaspects.h> +#include <projectexplorer/environmentkitaspect.h> #include <projectexplorer/processparameters.h> #include <projectexplorer/project.h> #include <projectexplorer/projectexplorerconstants.h> diff --git a/src/plugins/qtapplicationmanager/appmanagerdeployconfigurationfactory.cpp b/src/plugins/qtapplicationmanager/appmanagerdeployconfigurationfactory.cpp index a2596ad45c9..102933f47e1 100644 --- a/src/plugins/qtapplicationmanager/appmanagerdeployconfigurationfactory.cpp +++ b/src/plugins/qtapplicationmanager/appmanagerdeployconfigurationfactory.cpp @@ -9,8 +9,8 @@ #include "appmanagertr.h" #include <projectexplorer/deployconfiguration.h> +#include <projectexplorer/devicesupport/devicekitaspects.h> #include <projectexplorer/devicesupport/idevice.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/target.h> #include <projectexplorer/projectexplorerconstants.h> diff --git a/src/plugins/qtapplicationmanager/appmanagerdeploypackagestep.cpp b/src/plugins/qtapplicationmanager/appmanagerdeploypackagestep.cpp index f7e027d8b92..242b9ccd36f 100644 --- a/src/plugins/qtapplicationmanager/appmanagerdeploypackagestep.cpp +++ b/src/plugins/qtapplicationmanager/appmanagerdeploypackagestep.cpp @@ -12,7 +12,7 @@ #include <projectexplorer/buildstep.h> #include <projectexplorer/deployconfiguration.h> -#include <projectexplorer/kitaspects.h> +#include <projectexplorer/devicesupport/devicekitaspects.h> #include <projectexplorer/project.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/runconfiguration.h> diff --git a/src/plugins/qtapplicationmanager/appmanagerinstallpackagestep.cpp b/src/plugins/qtapplicationmanager/appmanagerinstallpackagestep.cpp index a5a75613def..35f573dd9c8 100644 --- a/src/plugins/qtapplicationmanager/appmanagerinstallpackagestep.cpp +++ b/src/plugins/qtapplicationmanager/appmanagerinstallpackagestep.cpp @@ -15,8 +15,8 @@ #include <projectexplorer/buildstep.h> #include <projectexplorer/deployconfiguration.h> +#include <projectexplorer/devicesupport/devicekitaspects.h> #include <projectexplorer/devicesupport/idevice.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/processparameters.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/target.h> diff --git a/src/plugins/qtapplicationmanager/appmanagerrunconfiguration.cpp b/src/plugins/qtapplicationmanager/appmanagerrunconfiguration.cpp index f1671bfdc7e..edb97c0186e 100644 --- a/src/plugins/qtapplicationmanager/appmanagerrunconfiguration.cpp +++ b/src/plugins/qtapplicationmanager/appmanagerrunconfiguration.cpp @@ -11,8 +11,8 @@ #include "appmanagertr.h" #include "appmanagerutilities.h" +#include <projectexplorer/devicesupport/devicekitaspects.h> #include <projectexplorer/environmentaspect.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/target.h> diff --git a/src/plugins/qtapplicationmanager/appmanagerruncontrol.cpp b/src/plugins/qtapplicationmanager/appmanagerruncontrol.cpp index dccb6528e24..812206c8243 100644 --- a/src/plugins/qtapplicationmanager/appmanagerruncontrol.cpp +++ b/src/plugins/qtapplicationmanager/appmanagerruncontrol.cpp @@ -20,12 +20,13 @@ #include <projectexplorer/buildconfiguration.h> #include <projectexplorer/buildsystem.h> #include <projectexplorer/buildtargetinfo.h> +#include <projectexplorer/devicesupport/devicekitaspects.h> #include <projectexplorer/environmentaspect.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/project.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/qmldebugcommandlinearguments.h> #include <projectexplorer/runcontrol.h> +#include <projectexplorer/sysrootkitaspect.h> #include <projectexplorer/target.h> #include <projectexplorer/toolchain.h> diff --git a/src/plugins/qtapplicationmanager/appmanagertargetinformation.cpp b/src/plugins/qtapplicationmanager/appmanagertargetinformation.cpp index 4891353953f..166a0ddd2cc 100644 --- a/src/plugins/qtapplicationmanager/appmanagertargetinformation.cpp +++ b/src/plugins/qtapplicationmanager/appmanagertargetinformation.cpp @@ -7,7 +7,7 @@ #include "appmanagerconstants.h" -#include <projectexplorer/kitaspects.h> +#include <projectexplorer/environmentkitaspect.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/runconfiguration.h> #include <projectexplorer/runcontrol.h> diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index 82598fdc265..98aaeb3b657 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -22,14 +22,16 @@ #include <projectexplorer/deployablefile.h> #include <projectexplorer/deploymentdata.h> +#include <projectexplorer/devicesupport/devicekitaspects.h> #include <projectexplorer/headerpath.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/project.h> #include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectmanager.h> #include <projectexplorer/projectmanager.h> +#include <projectexplorer/sysrootkitaspect.h> #include <projectexplorer/target.h> #include <projectexplorer/toolchain.h> +#include <projectexplorer/toolchainkitaspect.h> #include <projectexplorer/toolchainmanager.h> #include <utils/algorithm.h> diff --git a/src/plugins/qtsupport/qtkitaspect.cpp b/src/plugins/qtsupport/qtkitaspect.cpp index b738278db4f..fb0d7a4a504 100644 --- a/src/plugins/qtsupport/qtkitaspect.cpp +++ b/src/plugins/qtsupport/qtkitaspect.cpp @@ -10,13 +10,14 @@ #include "qttestparser.h" #include "qtversionmanager.h" +#include <projectexplorer/devicesupport/devicekitaspects.h> #include <projectexplorer/devicesupport/idevice.h> #include <projectexplorer/kitaspect.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/kitmanager.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/task.h> #include <projectexplorer/toolchain.h> +#include <projectexplorer/toolchainkitaspect.h> #include <projectexplorer/toolchainmanager.h> #include <qmakeprojectmanager/qmakeprojectmanagerconstants.h> diff --git a/src/plugins/qtsupport/qtprojectimporter.cpp b/src/plugins/qtsupport/qtprojectimporter.cpp index 17cb7a1cefe..c2210da5e9b 100644 --- a/src/plugins/qtsupport/qtprojectimporter.cpp +++ b/src/plugins/qtsupport/qtprojectimporter.cpp @@ -8,8 +8,8 @@ #include "qtversionmanager.h" #include <projectexplorer/kit.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/kitmanager.h> +#include <projectexplorer/sysrootkitaspect.h> #include <utils/algorithm.h> #include <utils/filepath.h> diff --git a/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp b/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp index 9077efdd629..e4d44ea458b 100644 --- a/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp +++ b/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp @@ -7,8 +7,8 @@ #include "remotelinuxtr.h" #include <projectexplorer/deployablefile.h> +#include <projectexplorer/devicesupport/devicekitaspects.h> #include <projectexplorer/devicesupport/idevice.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 084d73dc9b2..309d3f021df 100644 --- a/src/plugins/remotelinux/deploymenttimeinfo.cpp +++ b/src/plugins/remotelinux/deploymenttimeinfo.cpp @@ -4,9 +4,10 @@ #include "deploymenttimeinfo.h" #include <projectexplorer/deployablefile.h> +#include <projectexplorer/devicesupport/devicekitaspects.h> #include <projectexplorer/devicesupport/idevice.h> #include <projectexplorer/devicesupport/sshparameters.h> -#include <projectexplorer/kitaspects.h> +#include <projectexplorer/sysrootkitaspect.h> #include <projectexplorer/target.h> #include <QDateTime> diff --git a/src/plugins/remotelinux/genericdeploystep.cpp b/src/plugins/remotelinux/genericdeploystep.cpp index 5ea55a7f97f..805c82fc5f3 100644 --- a/src/plugins/remotelinux/genericdeploystep.cpp +++ b/src/plugins/remotelinux/genericdeploystep.cpp @@ -10,10 +10,10 @@ #include <projectexplorer/buildstep.h> #include <projectexplorer/buildsystem.h> #include <projectexplorer/deploymentdata.h> +#include <projectexplorer/devicesupport/devicekitaspects.h> #include <projectexplorer/devicesupport/devicemanager.h> #include <projectexplorer/devicesupport/filetransfer.h> #include <projectexplorer/devicesupport/idevice.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/runconfigurationaspects.h> #include <projectexplorer/target.h> diff --git a/src/plugins/remotelinux/makeinstallstep.cpp b/src/plugins/remotelinux/makeinstallstep.cpp index 604c41f2182..1a2519a3af8 100644 --- a/src/plugins/remotelinux/makeinstallstep.cpp +++ b/src/plugins/remotelinux/makeinstallstep.cpp @@ -11,8 +11,8 @@ #include <projectexplorer/buildsteplist.h> #include <projectexplorer/buildsystem.h> #include <projectexplorer/deployconfiguration.h> +#include <projectexplorer/devicesupport/devicekitaspects.h> #include <projectexplorer/devicesupport/idevice.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/makestep.h> #include <projectexplorer/processparameters.h> #include <projectexplorer/projectexplorerconstants.h> diff --git a/src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp b/src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp index bae288e3a4b..6503283f927 100644 --- a/src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp +++ b/src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp @@ -8,9 +8,9 @@ #include <coreplugin/icore.h> +#include <projectexplorer/devicesupport/devicekitaspects.h> #include <projectexplorer/environmentaspectwidget.h> #include <projectexplorer/environmentwidget.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/target.h> #include <utils/algorithm.h> diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp index 6952ec11095..0b74373c0e6 100644 --- a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp +++ b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp @@ -10,8 +10,8 @@ #include <projectexplorer/buildsystem.h> #include <projectexplorer/buildtargetinfo.h> #include <projectexplorer/deploymentdata.h> +#include <projectexplorer/devicesupport/devicekitaspects.h> #include <projectexplorer/devicesupport/idevice.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/project.h> #include <projectexplorer/runconfigurationaspects.h> #include <projectexplorer/target.h> diff --git a/src/plugins/studiowelcome/studiowelcomeplugin.cpp b/src/plugins/studiowelcome/studiowelcomeplugin.cpp index 5d63bed1f71..7ba2f9b84c8 100644 --- a/src/plugins/studiowelcome/studiowelcomeplugin.cpp +++ b/src/plugins/studiowelcome/studiowelcomeplugin.cpp @@ -14,14 +14,14 @@ #include <coreplugin/imode.h> #include <coreplugin/modemanager.h> -#include "projectexplorer/target.h" +#include <projectexplorer/devicesupport/devicekitaspects.h> #include <projectexplorer/devicesupport/idevice.h> #include <projectexplorer/jsonwizard/jsonwizardfactory.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/kitmanager.h> #include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectmanager.h> +#include <projectexplorer/target.h> #include <qmlprojectmanager/projectfilecontenttools.h> #include <qmlprojectmanager/qmlproject.h> diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp index a7e2ddefb93..5b4fa2365a3 100644 --- a/src/plugins/valgrind/memchecktool.cpp +++ b/src/plugins/valgrind/memchecktool.cpp @@ -32,8 +32,8 @@ #include <projectexplorer/buildconfiguration.h> #include <projectexplorer/deploymentdata.h> +#include <projectexplorer/devicesupport/devicekitaspects.h> #include <projectexplorer/devicesupport/devicemanager.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/project.h> #include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorerconstants.h> @@ -42,6 +42,7 @@ #include <projectexplorer/target.h> #include <projectexplorer/taskhub.h> #include <projectexplorer/toolchain.h> +#include <projectexplorer/toolchainkitaspect.h> #include <utils/checkablemessagebox.h> #include <utils/fileutils.h> diff --git a/src/plugins/valgrind/valgrindengine.cpp b/src/plugins/valgrind/valgrindengine.cpp index 9f399f9d464..f3f8fd07981 100644 --- a/src/plugins/valgrind/valgrindengine.cpp +++ b/src/plugins/valgrind/valgrindengine.cpp @@ -13,8 +13,8 @@ #include <extensionsystem/pluginmanager.h> +#include <projectexplorer/devicesupport/devicekitaspects.h> #include <projectexplorer/devicesupport/idevice.h> -#include <projectexplorer/kitaspects.h> #include <projectexplorer/projectexplorericons.h> #include <QApplication> |