diff --git a/src/plugins/projectexplorer/CMakeLists.txt b/src/plugins/projectexplorer/CMakeLists.txt index 5df2906b71b..92935bd3ce8 100644 --- a/src/plugins/projectexplorer/CMakeLists.txt +++ b/src/plugins/projectexplorer/CMakeLists.txt @@ -43,6 +43,7 @@ add_qtc_plugin(ProjectExplorer deploymentdata.cpp deploymentdata.h deploymentdatamodel.cpp deploymentdatamodel.h deploymentdataview.cpp deploymentdataview.h deploymentdataview.ui + desktoprunconfiguration.cpp desktoprunconfiguration.h devicesupport/desktopdevice.cpp devicesupport/desktopdevice.h devicesupport/desktopdeviceconfigurationwidget.cpp devicesupport/desktopdeviceconfigurationwidget.h devicesupport/desktopdeviceconfigurationwidget.ui devicesupport/desktopdevicefactory.cpp devicesupport/desktopdevicefactory.h diff --git a/src/plugins/qtsupport/desktoprunconfiguration.cpp b/src/plugins/projectexplorer/desktoprunconfiguration.cpp similarity index 97% rename from src/plugins/qtsupport/desktoprunconfiguration.cpp rename to src/plugins/projectexplorer/desktoprunconfiguration.cpp index 21b1c4e5343..c4f9bd48957 100644 --- a/src/plugins/qtsupport/desktoprunconfiguration.cpp +++ b/src/plugins/projectexplorer/desktoprunconfiguration.cpp @@ -25,12 +25,10 @@ #include "desktoprunconfiguration.h" -#include "qtoutputformatter.h" - -#include -#include -#include -#include +#include "localenvironmentaspect.h" +#include "project.h" +#include "runconfigurationaspects.h" +#include "target.h" #include #include @@ -43,10 +41,9 @@ #include -using namespace ProjectExplorer; using namespace Utils; -namespace QtSupport { +namespace ProjectExplorer { namespace Internal { DesktopRunConfiguration::DesktopRunConfiguration(Target *target, Core::Id id, Kind kind) diff --git a/src/plugins/qtsupport/desktoprunconfiguration.h b/src/plugins/projectexplorer/desktoprunconfiguration.h similarity index 69% rename from src/plugins/qtsupport/desktoprunconfiguration.h rename to src/plugins/projectexplorer/desktoprunconfiguration.h index dd38a3e4f40..4063337ef1c 100644 --- a/src/plugins/qtsupport/desktoprunconfiguration.h +++ b/src/plugins/projectexplorer/desktoprunconfiguration.h @@ -25,32 +25,29 @@ #pragma once -#include "qtsupport_global.h" +#include "runconfigurationaspects.h" +#include "runcontrol.h" -#include "projectexplorer/runconfigurationaspects.h" - -#include - -namespace QtSupport { +namespace ProjectExplorer { namespace Internal { -class DesktopRunConfiguration : public ProjectExplorer::RunConfiguration +class DesktopRunConfiguration : public RunConfiguration { Q_OBJECT protected: enum Kind { Qmake, Qbs, CMake }; // FIXME: Remove - DesktopRunConfiguration(ProjectExplorer::Target *target, Core::Id id, Kind kind); + DesktopRunConfiguration(Target *target, Core::Id id, Kind kind); private: - void doAdditionalSetup(const ProjectExplorer::RunConfigurationCreationInfo &info) final; + void doAdditionalSetup(const RunConfigurationCreationInfo &info) final; bool fromMap(const QVariantMap &map) final; void updateEnabledState() final; void updateTargetInformation(); - Utils::FilePath executableToRun(const ProjectExplorer::BuildTargetInfo &targetInfo) const; + Utils::FilePath executableToRun(const BuildTargetInfo &targetInfo) const; QString disabledReason() const override; bool isBuildTargetValid() const; @@ -58,23 +55,23 @@ private: const Kind m_kind; }; -class DesktopQmakeRunConfigurationFactory : public ProjectExplorer::RunConfigurationFactory +class DesktopQmakeRunConfigurationFactory : public RunConfigurationFactory { public: DesktopQmakeRunConfigurationFactory(); }; -class QbsRunConfigurationFactory : public ProjectExplorer::RunConfigurationFactory +class QbsRunConfigurationFactory : public RunConfigurationFactory { public: QbsRunConfigurationFactory(); }; -class CMakeRunConfigurationFactory : public ProjectExplorer::RunConfigurationFactory +class CMakeRunConfigurationFactory : public RunConfigurationFactory { public: CMakeRunConfigurationFactory(); }; } // namespace Internal -} // namespace QtSupport +} // namespace ProjectExplorer diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index 24041a955e6..edef2d320bd 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -33,6 +33,7 @@ #include "customwizard/customwizard.h" #include "deployablefile.h" #include "deployconfiguration.h" +#include "desktoprunconfiguration.h" #include "extraabi.h" #include "gcctoolchainfactories.h" #ifdef WITH_JOURNALD @@ -591,6 +592,17 @@ public: ToolChainKitAspect toolChainKitAspect; SysRootKitAspect sysRootKitAspect; EnvironmentKitAspect environmentKitAspect; + + DesktopQmakeRunConfigurationFactory qmakeRunConfigFactory; + QbsRunConfigurationFactory qbsRunConfigFactory; + CMakeRunConfigurationFactory cmakeRunConfigFactory; + + RunWorkerFactory desktopRunWorkerFactory{ + RunWorkerFactory::make(), + {ProjectExplorer::Constants::NORMAL_RUN_MODE}, + {qmakeRunConfigFactory.id(), qbsRunConfigFactory.id(), cmakeRunConfigFactory.id()} + }; + }; static ProjectExplorerPlugin *m_instance = nullptr; diff --git a/src/plugins/projectexplorer/projectexplorer.pro b/src/plugins/projectexplorer/projectexplorer.pro index 1196d6f95e7..3e13607721d 100644 --- a/src/plugins/projectexplorer/projectexplorer.pro +++ b/src/plugins/projectexplorer/projectexplorer.pro @@ -15,6 +15,7 @@ HEADERS += projectexplorer.h \ buildinfo.h \ clangparser.h \ configtaskhandler.h \ + desktoprunconfiguration.h \ environmentaspect.h \ environmentaspectwidget.h \ extraabi.h \ @@ -173,6 +174,7 @@ SOURCES += projectexplorer.cpp \ buildinfo.cpp \ clangparser.cpp \ configtaskhandler.cpp \ + desktoprunconfiguration.cpp \ environmentaspect.cpp \ environmentaspectwidget.cpp \ extraabi.cpp \ diff --git a/src/plugins/projectexplorer/projectexplorer.qbs b/src/plugins/projectexplorer/projectexplorer.qbs index a2b5f6e3b24..c4bc7efd39c 100644 --- a/src/plugins/projectexplorer/projectexplorer.qbs +++ b/src/plugins/projectexplorer/projectexplorer.qbs @@ -62,6 +62,7 @@ Project { "deploymentdataview.ui", "deploymentdatamodel.cpp", "deploymentdatamodel.h", + "desktoprunconfiguration.cpp", "desktoprunconfiguration.h", "editorconfiguration.cpp", "editorconfiguration.h", "editorsettingspropertiespage.cpp", "editorsettingspropertiespage.h", "editorsettingspropertiespage.ui", "environmentaspect.cpp", "environmentaspect.h", diff --git a/src/plugins/qtsupport/CMakeLists.txt b/src/plugins/qtsupport/CMakeLists.txt index b87082dfac6..ebd9aa5c8f8 100644 --- a/src/plugins/qtsupport/CMakeLists.txt +++ b/src/plugins/qtsupport/CMakeLists.txt @@ -9,7 +9,6 @@ add_qtc_plugin(QtSupport codegensettingspage.cpp codegensettingspage.h codegensettingspagewidget.ui desktopqtversion.cpp desktopqtversion.h - desktoprunconfiguration.cpp desktoprunconfiguration.h exampleslistmodel.cpp exampleslistmodel.h gettingstartedwelcomepage.cpp gettingstartedwelcomepage.h profilereader.cpp profilereader.h diff --git a/src/plugins/qtsupport/qtsupport.pro b/src/plugins/qtsupport/qtsupport.pro index b8f4875b64e..e378fbe75d1 100644 --- a/src/plugins/qtsupport/qtsupport.pro +++ b/src/plugins/qtsupport/qtsupport.pro @@ -32,7 +32,6 @@ HEADERS += \ desktopqtversion.h \ uicgenerator.h \ qscxmlcgenerator.h \ - desktoprunconfiguration.h \ translationwizardpage.h SOURCES += \ @@ -59,7 +58,6 @@ SOURCES += \ desktopqtversion.cpp \ uicgenerator.cpp \ qscxmlcgenerator.cpp \ - desktoprunconfiguration.cpp \ translationwizardpage.cpp FORMS += \ diff --git a/src/plugins/qtsupport/qtsupport.qbs b/src/plugins/qtsupport/qtsupport.qbs index 78d499300d7..86a203cf867 100644 --- a/src/plugins/qtsupport/qtsupport.qbs +++ b/src/plugins/qtsupport/qtsupport.qbs @@ -67,8 +67,6 @@ Project { "codegensettingspage.cpp", "codegensettingspage.h", "codegensettingspagewidget.ui", - "desktoprunconfiguration.cpp", - "desktoprunconfiguration.h", "qtconfigwidget.cpp", "qtconfigwidget.h", "qtcppkitinfo.cpp", diff --git a/src/plugins/qtsupport/qtsupportplugin.cpp b/src/plugins/qtsupport/qtsupportplugin.cpp index 897c3d85d58..0ff2adf6b2f 100644 --- a/src/plugins/qtsupport/qtsupportplugin.cpp +++ b/src/plugins/qtsupport/qtsupportplugin.cpp @@ -40,7 +40,6 @@ #include "qscxmlcgenerator.h" #include "desktopqtversion.h" -#include "desktoprunconfiguration.h" #include "profilereader.h" #include @@ -72,16 +71,6 @@ public: CodeGenSettingsPage codeGenSettingsPage; QtOptionsPage qtOptionsPage; - DesktopQmakeRunConfigurationFactory qmakeRunConfigFactory; - QbsRunConfigurationFactory qbsRunConfigFactory; - CMakeRunConfigurationFactory cmakeRunConfigFactory; - - RunWorkerFactory desktopRunWorkerFactory{ - RunWorkerFactory::make(), - {ProjectExplorer::Constants::NORMAL_RUN_MODE}, - {qmakeRunConfigFactory.id(), qbsRunConfigFactory.id(), cmakeRunConfigFactory.id()} - }; - ExamplesWelcomePage examplesPage{true}; ExamplesWelcomePage tutorialPage{false};