From a91aa317ee8519ada86151ebc42dd28f014f4656 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Mon, 27 Nov 2017 14:34:32 +0100
Subject: [PATCH] Accept qmlproject runconfigs on remotelinux

The qmlproject run configuration will figure out which qmlscene to use,
so this is correct in any case.

Change-Id: I9c6b11606e1edfe60dcf6652c1f22124d50336f2
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 src/plugins/remotelinux/remotelinuxplugin.cpp | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/plugins/remotelinux/remotelinuxplugin.cpp b/src/plugins/remotelinux/remotelinuxplugin.cpp
index 509caab5bbd..fc330b3ca27 100644
--- a/src/plugins/remotelinux/remotelinuxplugin.cpp
+++ b/src/plugins/remotelinux/remotelinuxplugin.cpp
@@ -27,6 +27,7 @@
 
 #include "embeddedlinuxqtversionfactory.h"
 #include "genericlinuxdeviceconfigurationfactory.h"
+#include "remotelinux_constants.h"
 #include "remotelinuxqmltoolingsupport.h"
 #include "remotelinuxcustomrunconfiguration.h"
 #include "remotelinuxdebugsupport.h"
@@ -42,6 +43,9 @@
 #include "tarpackagecreationstep.h"
 #include "uploadandinstalltarpackagestep.h"
 
+#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/target.h>
+
 #include <QtPlugin>
 
 namespace RemoteLinux {
@@ -75,9 +79,16 @@ bool RemoteLinuxPlugin::initialize(const QStringList &arguments,
     using namespace ProjectExplorer::Constants;
 
     auto constraint = [](RunConfiguration *runConfig) {
+        const Core::Id devType = ProjectExplorer::DeviceTypeKitInformation::deviceTypeId(
+                    runConfig->target()->kit());
+
+        if (devType != Constants::GenericLinuxOsType)
+            return false;
+
         const Core::Id id = runConfig->id();
         return id == RemoteLinuxCustomRunConfiguration::runConfigId()
-            || id.name().startsWith(RemoteLinuxRunConfiguration::IdPrefix);
+            || id.name().startsWith(RemoteLinuxRunConfiguration::IdPrefix)
+            || id.name().startsWith("QmlProjectManager.QmlRunConfiguration");
     };
 
     RunControl::registerWorker<SimpleTargetRunner>(NORMAL_RUN_MODE, constraint);