diff --git a/src/plugins/analyzerbase/analyzerconstants.h b/src/plugins/analyzerbase/analyzerconstants.h
index e5b0babdb02..c346670f52d 100644
--- a/src/plugins/analyzerbase/analyzerconstants.h
+++ b/src/plugins/analyzerbase/analyzerconstants.h
@@ -43,8 +43,7 @@ namespace Analyzer {
 enum StartMode
 {
     StartLocal = -1,
-    StartRemote = -2,
-    StartQmlRemote = -4 // TODO: remove this enum and make it generic
+    StartRemote = -2
 };
 
 namespace Constants {
diff --git a/src/plugins/analyzerbase/analyzerstartparameters.h b/src/plugins/analyzerbase/analyzerstartparameters.h
index edc9d40a93f..034f962f745 100644
--- a/src/plugins/analyzerbase/analyzerstartparameters.h
+++ b/src/plugins/analyzerbase/analyzerstartparameters.h
@@ -47,7 +47,7 @@ namespace Analyzer {
 class ANALYZER_EXPORT AnalyzerStartParameters
 {
 public:
-    AnalyzerStartParameters()
+    AnalyzerStartParameters() : analyzerPort(0)
     {}
 
     StartMode startMode;
diff --git a/src/plugins/android/androidanalyzesupport.cpp b/src/plugins/android/androidanalyzesupport.cpp
index dc71f02adbd..f514537ec46 100644
--- a/src/plugins/android/androidanalyzesupport.cpp
+++ b/src/plugins/android/androidanalyzesupport.cpp
@@ -65,7 +65,7 @@ RunControl *AndroidAnalyzeSupport::createAnalyzeRunControl(AndroidRunConfigurati
         QTC_ASSERT(server.listen(QHostAddress::LocalHost)
                    || server.listen(QHostAddress::LocalHostIPv6), return 0);
         params.analyzerHost = server.serverAddress().toString();
-        params.startMode = StartQmlRemote;
+        params.startMode = StartLocal;
     }
 
     AnalyzerRunControl *analyzerRunControl = AnalyzerManager::createRunControl(params, runConfig);
diff --git a/src/plugins/qmlprofiler/qmlprofilerengine.cpp b/src/plugins/qmlprofiler/qmlprofilerengine.cpp
index 993ba27c752..392588d5a9d 100644
--- a/src/plugins/qmlprofiler/qmlprofilerengine.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerengine.cpp
@@ -120,7 +120,7 @@ bool QmlProfilerRunControl::startEngine()
         }
     }
 
-    if (startParameters().startMode == StartQmlRemote || startParameters().startMode == StartLocal) {
+    if (startParameters().startMode == StartLocal) {
         d->m_noDebugOutputTimer.start();
     } else {
         emit processRunning(startParameters().analyzerPort);
@@ -267,7 +267,7 @@ void QmlProfilerRunControl::processIsRunning(quint16 port)
 {
     d->m_noDebugOutputTimer.stop();
 
-    if (port > 0 && mode() != StartQmlRemote)
+    if (port > 0 && startParameters().analyzerPort != 0)
         emit processRunning(port);
 }
 
diff --git a/src/plugins/qnx/qnxruncontrolfactory.cpp b/src/plugins/qnx/qnxruncontrolfactory.cpp
index 069577550ed..389870502aa 100644
--- a/src/plugins/qnx/qnxruncontrolfactory.cpp
+++ b/src/plugins/qnx/qnxruncontrolfactory.cpp
@@ -125,7 +125,7 @@ static AnalyzerStartParameters createAnalyzerStartParameters(const QnxRunConfigu
         return params;
 
     if (mode == QmlProfilerRunMode)
-        params.startMode = StartQmlRemote;
+        params.startMode = StartLocal;
     params.debuggee = runConfig->remoteExecutableFilePath();
     params.debuggeeArgs = runConfig->arguments();
     params.connParams = DeviceKitInformation::device(runConfig->target()->kit())->sshParameters();
diff --git a/src/plugins/remotelinux/remotelinuxanalyzesupport.cpp b/src/plugins/remotelinux/remotelinuxanalyzesupport.cpp
index 3fe3b652e77..e51b544f87d 100644
--- a/src/plugins/remotelinux/remotelinuxanalyzesupport.cpp
+++ b/src/plugins/remotelinux/remotelinuxanalyzesupport.cpp
@@ -78,7 +78,7 @@ AnalyzerStartParameters RemoteLinuxAnalyzeSupport::startParameters(const RemoteL
 {
     AnalyzerStartParameters params;
     if (runMode == QmlProfilerRunMode)
-        params.startMode = StartQmlRemote;
+        params.startMode = StartLocal;
     params.runMode = runMode;
     params.connParams = DeviceKitInformation::device(runConfig->target()->kit())->sshParameters();
     params.analyzerCmdPrefix = runConfig->commandPrefix();
@@ -114,9 +114,6 @@ void RemoteLinuxAnalyzeSupport::showMessage(const QString &msg, Utils::OutputFor
 
 void RemoteLinuxAnalyzeSupport::handleRemoteSetupRequested()
 {
-    if (d->runControl->mode() != Analyzer::StartQmlRemote)
-        return;
-
     QTC_ASSERT(state() == Inactive, return);
 
     showMessage(tr("Checking available ports...\n"), Utils::NormalMessageFormat);
@@ -169,8 +166,6 @@ void RemoteLinuxAnalyzeSupport::handleAppRunnerFinished(bool success)
 
 void RemoteLinuxAnalyzeSupport::handleProfilingFinished()
 {
-    if (d->runControl->mode() != Analyzer::StartQmlRemote)
-        return;
     setFinished();
 }