Merge remote-tracking branch 'origin/4.4'

Change-Id: I778acc044ac105a11054b314aecac5b1c2cfee6a

1 files changed, 2 insertions, 11 deletions

diff --git a/src/plugins/qmlprofiler/qmlprofilerplugin.cpp b/src/plugins/qmlprofiler/qmlprofilerplugin.cpp
index 777a042fc1..ea89b6b6dc 100644
--- a/src/plugins/qmlprofiler/qmlprofilerplugin.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerplugin.cpp
@@ -76,16 +76,6 @@ namespace Internal {
 
 Q_GLOBAL_STATIC(QmlProfilerSettings, qmlProfilerGlobalSettings)
 
-
-class QmlProfilerRunControlFactory : public IRunControlFactory
-{
-public:
-    IRunConfigurationAspect *createRunConfigurationAspect(RunConfiguration *rc) override
-    {
-        return new QmlProfilerRunConfigurationAspect(rc);
-    }
-};
-
 bool QmlProfilerPlugin::initialize(const QStringList &arguments, QString *errorString)
 {
     Q_UNUSED(arguments)
@@ -101,7 +91,8 @@ void QmlProfilerPlugin::extensionsInitialized()
     (void) new QmlProfilerTool(this);
 
     addAutoReleasedObject(new QmlProfilerOptionsPage);
-    addAutoReleasedObject(new QmlProfilerRunControlFactory);
+
+    RunConfiguration::registerAspect<QmlProfilerRunConfigurationAspect>();
 
     auto constraint = [](RunConfiguration *runConfiguration) {
         Target *target = runConfiguration ? runConfiguration->target() : nullptr;