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

Fix using (local) custom run configuration with non-Desktop kits

Browse Source 
For targets such as remote Linux, we would run all run configurations on
the remote device, even "custom run configuration", which is explicitly
intended for running locally.

Task-number: QTCREATORBUG-19121
Change-Id: I83d6bdd8a47440047d230266845286715432604a
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2017-10-20 17:59:51 +02:00
parent 14e6a30ebf
commit 9a493f8b83
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/projectexplorer/runconfiguration.cpp
View File

@@ -616,7 +616,10 @@ public:
runnable = runConfiguration->runnable(); runnable = runConfiguration->runnable();
displayName = runConfiguration->displayName(); displayName = runConfiguration->displayName();
outputFormatter = runConfiguration->createOutputFormatter(); outputFormatter = runConfiguration->createOutputFormatter();
device = DeviceKitInformation::device(runConfiguration->target()->kit()); if (runnable.is<StandardRunnable>())
device = runnable.as<StandardRunnable>().device;
if (!device)
device = DeviceKitInformation::device(runConfiguration->target()->kit());
project = runConfiguration->target()->project(); project = runConfiguration->target()->project();
} else { } else {
outputFormatter = new OutputFormatter(); outputFormatter = new OutputFormatter();