QmlProject: Move RunConfigurationFactory close to RunConfiguration

No need to have a dozen lines of code in a separate translation
unit and more in line with what others do nowadays.

Change-Id: I765535d1484805bc3005fe23bfd4992a96a80e9c
Reviewed-by: hjk <hjk@qt.io>

4 files changed, 20 insertions, 6 deletions

diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanager.pro b/src/plugins/qmlprojectmanager/qmlprojectmanager.pro
index 2a12d7a631..173e3886db 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectmanager.pro
+++ b/src/plugins/qmlprojectmanager/qmlprojectmanager.pro
@@ -10,7 +10,6 @@ HEADERS += qmlproject.h \
     qmlprojectconstants.h \
     qmlprojectnodes.h \
     qmlprojectrunconfiguration.h \
-    qmlprojectrunconfigurationfactory.h \
     qmlprojectmanager_global.h \
     qmlprojectmanagerconstants.h \
     qmlprojectrunconfigurationwidget.h
@@ -20,7 +19,6 @@ SOURCES += qmlproject.cpp \
     qmlprojectplugin.cpp \
     qmlprojectnodes.cpp \
     qmlprojectrunconfiguration.cpp \
-    qmlprojectrunconfigurationfactory.cpp \
     qmlprojectrunconfigurationwidget.cpp
 
 RESOURCES += qmlproject.qrc
diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs b/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
index b6dcdcd5f5..fcf34e30c8 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
+++ b/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
@@ -23,7 +23,6 @@ QtcPlugin {
             "qmlprojectnodes.cpp", "qmlprojectnodes.h",
             "qmlprojectplugin.cpp", "qmlprojectplugin.h",
             "qmlprojectrunconfiguration.cpp", "qmlprojectrunconfiguration.h",
-            "qmlprojectrunconfigurationfactory.cpp", "qmlprojectrunconfigurationfactory.h",
             "qmlprojectrunconfigurationwidget.cpp", "qmlprojectrunconfigurationwidget.h"
         ]
     }
diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
index 6118e7651f..76cba32823 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
@@ -48,8 +48,6 @@ using namespace Core;
 using namespace ProjectExplorer;
 using namespace QtSupport;
 
-using namespace QmlProjectManager::Internal;
-
 namespace QmlProjectManager {
 
 const char M_CURRENT_FILE[] = "CurrentFile";
@@ -146,7 +144,7 @@ QString QmlProjectRunConfiguration::commandLineArguments() const
 
 QWidget *QmlProjectRunConfiguration::createConfigurationWidget()
 {
-    return wrapWidget(new QmlProjectRunConfigurationWidget(this));
+    return wrapWidget(new Internal::QmlProjectRunConfigurationWidget(this));
 }
 
 Utils::OutputFormatter *QmlProjectRunConfiguration::createOutputFormatter() const
@@ -297,4 +295,14 @@ void QmlProjectRunConfiguration::updateEnabledState()
     }
 }
 
+namespace Internal {
+
+QmlProjectRunConfigurationFactory::QmlProjectRunConfigurationFactory()
+    : FixedRunConfigurationFactory(QmlProjectRunConfiguration::tr("QML Scene"), false)
+{
+    registerRunConfiguration<QmlProjectRunConfiguration>(Constants::QML_SCENE_RC_ID);
+    addSupportedProjectType(QmlProjectManager::Constants::QML_PROJECT_ID);
+}
+
+} // namespace Internal
 } // namespace QmlProjectManager
diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h
index 78a8cfbbc2..dc89200222 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h
+++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h
@@ -86,4 +86,13 @@ private:
     QString m_qmlViewerArgs;
 };
 
+namespace Internal {
+
+class QmlProjectRunConfigurationFactory : public ProjectExplorer::FixedRunConfigurationFactory
+{
+public:
+    QmlProjectRunConfigurationFactory();
+};
+
+} // namespace Internal
 } // namespace QmlProjectManager