feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Accept qmlproject runconfigs on remotelinux

Browse Source 
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>
This commit is contained in:
Ulf Hermann
2017-11-27 14:34:32 +01:00
parent 0f32727097
commit a91aa317ee
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/remotelinux/remotelinuxplugin.cpp
View File

@@ -27,6 +27,7 @@
#include "embeddedlinuxqtversionfactory.h" #include "embeddedlinuxqtversionfactory.h"
#include "genericlinuxdeviceconfigurationfactory.h" #include "genericlinuxdeviceconfigurationfactory.h"
#include "remotelinux_constants.h"
#include "remotelinuxqmltoolingsupport.h" #include "remotelinuxqmltoolingsupport.h"
#include "remotelinuxcustomrunconfiguration.h" #include "remotelinuxcustomrunconfiguration.h"
#include "remotelinuxdebugsupport.h" #include "remotelinuxdebugsupport.h"
@@ -42,6 +43,9 @@
#include "tarpackagecreationstep.h" #include "tarpackagecreationstep.h"
#include "uploadandinstalltarpackagestep.h" #include "uploadandinstalltarpackagestep.h"
#include <projectexplorer/kitinformation.h>
#include <projectexplorer/target.h>
#include <QtPlugin> #include <QtPlugin>
namespace RemoteLinux { namespace RemoteLinux {
@@ -75,9 +79,16 @@ bool RemoteLinuxPlugin::initialize(const QStringList &arguments,
using namespace ProjectExplorer::Constants; using namespace ProjectExplorer::Constants;
auto constraint = [](RunConfiguration *runConfig) { 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(); const Core::Id id = runConfig->id();
return id == RemoteLinuxCustomRunConfiguration::runConfigId() 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); RunControl::registerWorker<SimpleTargetRunner>(NORMAL_RUN_MODE, constraint);