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

ProjectExplorer: Move default runnable setting

Browse Source 
... to where it belongs, guarded by a check of RunConfigartion presence

Change-Id: Ie2bfdea30fded81f12a6962c9717c8574fc14ba5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2017-04-11 13:34:33 +02:00
parent b2be9b5b0a
commit e2e843a30d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -523,6 +523,7 @@ public:
: q(parent), runMode(mode), runConfiguration(runConfiguration) : q(parent), runMode(mode), runConfiguration(runConfiguration)
{ {
if (runConfiguration) { if (runConfiguration) {
runnable = runConfiguration->runnable();
displayName = runConfiguration->displayName(); displayName = runConfiguration->displayName();
outputFormatter = runConfiguration->createOutputFormatter(); outputFormatter = runConfiguration->createOutputFormatter();
device = DeviceKitInformation::device(runConfiguration->target()->kit()); device = DeviceKitInformation::device(runConfiguration->target()->kit());
@@ -604,7 +605,6 @@ using namespace Internal;
RunControl::RunControl(RunConfiguration *runConfiguration, Core::Id mode) : RunControl::RunControl(RunConfiguration *runConfiguration, Core::Id mode) :
d(new RunControlPrivate(this, runConfiguration, mode)) d(new RunControlPrivate(this, runConfiguration, mode))
{ {
d->runnable = runConfiguration->runnable();
#ifdef WITH_JOURNALD #ifdef WITH_JOURNALD
JournaldWatcher::instance()->subscribe(this, [this](const JournaldWatcher::LogEntry &entry) { JournaldWatcher::instance()->subscribe(this, [this](const JournaldWatcher::LogEntry &entry) {
if (entry.value("_MACHINE_ID") != JournaldWatcher::instance()->machineId()) if (entry.value("_MACHINE_ID") != JournaldWatcher::instance()->machineId())