aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qtsupport/qtsupportplugin.cpp
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2019-08-06 16:50:30 +0200
committerhjk <hjk@qt.io>2019-08-07 10:35:41 +0000
commit07a918c89a0993f4c9568920d1155ff6c831fbf7 (patch)
treefb72827341f9de72c3b1e12c3533de48ff393502 /src/plugins/qtsupport/qtsupportplugin.cpp
parent2521023627066ba6dd6f6446f2ad6a6f144efc01 (diff)
Unification of desktop run configurations, step 1
First step, move {DesktopQt,Qbs,CMake}RunConfiguration{,Factory} into the same new files. This only moves down to QtSupport, not ProjectExplorer, as there are in all three cases direct dependencies on QtSupport. Long term I would expect them to move further down. Change-Id: Ib16b19df7f3f642ed7f7db89a1f6904601d976ba Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/qtsupport/qtsupportplugin.cpp')
-rw-r--r--src/plugins/qtsupport/qtsupportplugin.cpp15
1 files changed, 15 insertions, 0 deletions
diff --git a/src/plugins/qtsupport/qtsupportplugin.cpp b/src/plugins/qtsupport/qtsupportplugin.cpp
index a143db76b3a..d1d4ca75f53 100644
--- a/src/plugins/qtsupport/qtsupportplugin.cpp
+++ b/src/plugins/qtsupport/qtsupportplugin.cpp
@@ -38,6 +38,7 @@
#include "qscxmlcgenerator.h"
#include "desktopqtversion.h"
+#include "desktoprunconfiguration.h"
#include "profilereader.h"
#include <coreplugin/icore.h>
@@ -45,6 +46,7 @@
#include <projectexplorer/project.h>
#include <projectexplorer/projecttree.h>
+#include <projectexplorer/runcontrol.h>
#include <projectexplorer/target.h>
#include <utils/macroexpander.h>
@@ -53,6 +55,7 @@ const char kHostBins[] = "CurrentProject:QT_HOST_BINS";
const char kInstallBins[] = "CurrentProject:QT_INSTALL_BINS";
using namespace Core;
+using namespace ProjectExplorer;
namespace QtSupport {
namespace Internal {
@@ -66,6 +69,18 @@ public:
CodeGenSettingsPage codeGenSettingsPage;
QtOptionsPage qtOptionsPage;
+ DesktopQmakeRunConfigurationFactory desktopQmakeRunConfigFactory;
+ SimpleRunWorkerFactory<SimpleTargetRunner, DesktopQmakeRunConfiguration>
+ desktopQmakeRunWorkerFactory;
+
+ QbsRunConfigurationFactory desktopQbsRunConfigFactory;
+ SimpleRunWorkerFactory<SimpleTargetRunner, QbsRunConfiguration>
+ desktopQbsRunWorkerFactory;
+
+ CMakeRunConfigurationFactory desktopCMakeRunConfigFactory;
+ SimpleRunWorkerFactory<SimpleTargetRunner, CMakeRunConfiguration>
+ desktopCMakeRunWorkerFactory;
+
ExamplesWelcomePage examplesPage{true};
ExamplesWelcomePage tutorialPage{false};