aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2017-11-27 14:34:32 +0100
committerUlf Hermann <ulf.hermann@qt.io>2018-02-01 11:14:02 +0000
commita91aa317ee8519ada86151ebc42dd28f014f4656 (patch)
tree6cfaaead0da5252f4b51a82f1b7c20e8f32b1ed1
parent0f327270971f06d3b41b387f8c4c16d001bb610c (diff)
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>
-rw-r--r--src/plugins/remotelinux/remotelinuxplugin.cpp13
1 files changed, 12 insertions, 1 deletions
diff --git a/src/plugins/remotelinux/remotelinuxplugin.cpp b/src/plugins/remotelinux/remotelinuxplugin.cpp
index 509caab5bb..fc330b3ca2 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);