diff options
Diffstat (limited to 'src/plugins/qtapplicationmanager')
4 files changed, 42 insertions, 23 deletions
diff --git a/src/plugins/qtapplicationmanager/appmanagercmakepackagestep.cpp b/src/plugins/qtapplicationmanager/appmanagercmakepackagestep.cpp index e7caa20a36c..53e46cec94a 100644 --- a/src/plugins/qtapplicationmanager/appmanagercmakepackagestep.cpp +++ b/src/plugins/qtapplicationmanager/appmanagercmakepackagestep.cpp @@ -10,6 +10,7 @@ #include "appmanagertr.h" #include <projectexplorer/buildstep.h> +#include <projectexplorer/buildsystem.h> #include <projectexplorer/deployconfiguration.h> #include <projectexplorer/project.h> #include <projectexplorer/projectexplorerconstants.h> @@ -35,10 +36,22 @@ public: step->setBuildTargets({targetInformation.cmakeBuildTarget}); step->setStepEnabled(!targetInformation.isBuiltin); }; - QObject::connect(step->target(), &Target::activeRunConfigurationChanged, step, updaterSlot); - QObject::connect(step->target(), &Target::activeDeployConfigurationChanged, step, updaterSlot); - QObject::connect(step->target(), &Target::parsingFinished, step, updaterSlot); - QObject::connect(step->target(), &Target::runConfigurationsUpdated, step, updaterSlot); + QObject::connect( + step->buildConfiguration(), + &BuildConfiguration::activeRunConfigurationChanged, + step, + updaterSlot); + QObject::connect( + step->buildConfiguration(), + &BuildConfiguration::activeDeployConfigurationChanged, + step, + updaterSlot); + QObject::connect(step->buildSystem(), &BuildSystem::parsingFinished, step, updaterSlot); + QObject::connect( + step->buildConfiguration(), + &BuildConfiguration::runConfigurationsUpdated, + step, + updaterSlot); QObject::connect(step->project(), &Project::displayNameChanged, step, updaterSlot); }); diff --git a/src/plugins/qtapplicationmanager/appmanagerdeployconfigurationautoswitcher.cpp b/src/plugins/qtapplicationmanager/appmanagerdeployconfigurationautoswitcher.cpp index 2ab0c640ec2..7d30c1c2fdc 100644 --- a/src/plugins/qtapplicationmanager/appmanagerdeployconfigurationautoswitcher.cpp +++ b/src/plugins/qtapplicationmanager/appmanagerdeployconfigurationautoswitcher.cpp @@ -7,6 +7,7 @@ #include "appmanagerconstants.h" +#include <projectexplorer/buildconfiguration.h> #include <projectexplorer/deployconfiguration.h> #include <projectexplorer/project.h> #include <projectexplorer/projectmanager.h> @@ -52,7 +53,7 @@ void AppManagerDeployConfigurationAutoSwitcher::onActiveDeployConfigurationChang if (m_deployConfiguration != deployConfiguration) { m_deployConfiguration = deployConfiguration; if (deployConfiguration && deployConfiguration->target()) { - if (auto runConfiguration = deployConfiguration->target()->activeRunConfiguration()) { + if (auto runConfiguration = deployConfiguration->buildConfiguration()->activeRunConfiguration()) { m_deployConfigurationsUsageHistory.insert(runConfiguration, deployConfiguration); } } @@ -75,23 +76,23 @@ void AppManagerDeployConfigurationAutoSwitcher::onActiveRunConfigurationChanged( if (m_runConfiguration != runConfiguration) { m_runConfiguration = runConfiguration; if (runConfiguration) { - if (auto target = runConfiguration->target()) { + if (BuildConfiguration * const bc = runConfiguration->buildConfiguration()) { const auto stored = m_deployConfigurationsUsageHistory.contains(runConfiguration); if (stored) { // deploy selection stored -> restore auto deployConfiguration = m_deployConfigurationsUsageHistory.value(runConfiguration, nullptr); - target->setActiveDeployConfiguration(deployConfiguration); - } else if (auto activeDeployConfiguration = target->activeDeployConfiguration()) { + bc->setActiveDeployConfiguration(deployConfiguration); + } else if (auto activeDeployConfiguration = bc->activeDeployConfiguration()) { // active deploy configuration exists if (isApplicationManagerRunConfiguration(runConfiguration)) { // current run configuration is AM if (!isApplicationManagerDeployConfiguration(activeDeployConfiguration)) { // current deploy configuration is not AM - for (auto deployConfiguration : target->deployConfigurations()) { + for (auto deployConfiguration : bc->deployConfigurations()) { // find AM deploy configuration if (isApplicationManagerDeployConfiguration(deployConfiguration)) { // make it active - target->setActiveDeployConfiguration(deployConfiguration); + bc->setActiveDeployConfiguration(deployConfiguration); break; } } @@ -100,11 +101,11 @@ void AppManagerDeployConfigurationAutoSwitcher::onActiveRunConfigurationChanged( // current run configuration is not AM if (isApplicationManagerDeployConfiguration(activeDeployConfiguration)) { // current deploy configuration is AM - for (auto deployConfiguration : target->deployConfigurations()) { + for (auto deployConfiguration : bc->deployConfigurations()) { // find not AM deploy configuration if (!isApplicationManagerDeployConfiguration(deployConfiguration)) { // make it active - target->setActiveDeployConfiguration(deployConfiguration); + bc->setActiveDeployConfiguration(deployConfiguration); break; } } diff --git a/src/plugins/qtapplicationmanager/appmanagerdeploypackagestep.cpp b/src/plugins/qtapplicationmanager/appmanagerdeploypackagestep.cpp index abf2e99ad4b..012f2f13570 100644 --- a/src/plugins/qtapplicationmanager/appmanagerdeploypackagestep.cpp +++ b/src/plugins/qtapplicationmanager/appmanagerdeploypackagestep.cpp @@ -13,17 +13,15 @@ #include <projectexplorer/buildstep.h> #include <projectexplorer/deployconfiguration.h> #include <projectexplorer/devicesupport/devicekitaspects.h> +#include <projectexplorer/buildsystem.h> #include <projectexplorer/project.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/runconfiguration.h> #include <projectexplorer/target.h> -#include <remotelinux/remotelinux_constants.h> - #include <utils/filestreamer.h> using namespace ProjectExplorer; -using namespace RemoteLinux; using namespace Tasking; using namespace Utils; @@ -62,10 +60,13 @@ public: setStepEnabled(!targetInformation.isBuiltin); }; - connect(target(), &Target::activeRunConfigurationChanged, this, updateAspects); - connect(target(), &Target::activeDeployConfigurationChanged, this, updateAspects); - connect(target(), &Target::parsingFinished, this, updateAspects); - connect(target(), &Target::runConfigurationsUpdated, this, updateAspects); + connect(buildConfiguration(), &BuildConfiguration::activeRunConfigurationChanged, + this, updateAspects); + connect(buildConfiguration(), &BuildConfiguration::activeDeployConfigurationChanged, + this, updateAspects); + connect(buildSystem(), &BuildSystem::parsingFinished, this, updateAspects); + connect(buildConfiguration(), &BuildConfiguration::runConfigurationsUpdated, + this, updateAspects); connect(project(), &Project::displayNameChanged, this, updateAspects); connect(&customizeStep, &BaseAspect::changed, this, updateAspects); diff --git a/src/plugins/qtapplicationmanager/appmanagerinstallpackagestep.cpp b/src/plugins/qtapplicationmanager/appmanagerinstallpackagestep.cpp index 9163815d29a..e503c240315 100644 --- a/src/plugins/qtapplicationmanager/appmanagerinstallpackagestep.cpp +++ b/src/plugins/qtapplicationmanager/appmanagerinstallpackagestep.cpp @@ -14,6 +14,7 @@ #include <remotelinux/abstractremotelinuxdeploystep.h> #include <projectexplorer/buildstep.h> +#include <projectexplorer/buildsystem.h> #include <projectexplorer/deployconfiguration.h> #include <projectexplorer/devicesupport/devicekitaspects.h> #include <projectexplorer/devicesupport/idevice.h> @@ -85,10 +86,13 @@ AppManagerInstallPackageStep::AppManagerInstallPackageStep(BuildStepList *bsl, I setStepEnabled(!targetInformation.isBuiltin); }; - connect(target(), &Target::activeRunConfigurationChanged, this, updateAspects); - connect(target(), &Target::activeDeployConfigurationChanged, this, updateAspects); - connect(target(), &Target::parsingFinished, this, updateAspects); - connect(target(), &Target::runConfigurationsUpdated, this, updateAspects); + connect(buildConfiguration(), &BuildConfiguration::activeRunConfigurationChanged, + this, updateAspects); + connect(buildConfiguration(), &BuildConfiguration::activeDeployConfigurationChanged, + this, updateAspects); + connect(buildSystem(), &BuildSystem::parsingFinished, this, updateAspects); + connect(buildConfiguration(), &BuildConfiguration::runConfigurationsUpdated, + this, updateAspects); connect(project(), &Project::displayNameChanged, this, updateAspects); connect(&customizeStep, &BaseAspect::changed, this, updateAspects); updateAspects(); |