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

RunControl: Drop IDevice * from doStart()

Browse Source 
Use device set inside passed runnable instead.

Grep for all usages of RunControl::start().
If passed device wasn't nullptr, set this device
inside passed runnable. Otherwise ensure that
passed runnable contains device set to nullptr.

Change-Id: I06fd42a16246fa9fedd81eeb47481a217f887cb0
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2022-02-23 16:58:20 +01:00
parent 3f259da6d5
commit f1e973de79
12 changed files with 32 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/projectexplorer/runcontrol.cpp
View File

@@ -1188,13 +1188,16 @@ SimpleTargetRunner::SimpleTargetRunner(RunControl *runControl)
void SimpleTargetRunner::start()
{
if (m_starter)
if (m_starter) {
m_starter();
else
doStart(runControl()->runnable(), runControl()->device());
} else {
Runnable runnable = runControl()->runnable();
runnable.device = runControl()->device();
doStart(runControl()->runnable());
}
}
void SimpleTargetRunner::doStart(const Runnable &runnable, const IDevice::ConstPtr &device)
void SimpleTargetRunner::doStart(const Runnable &runnable)
{
m_stopForced = false;
m_stopReported = false;
@@ -1231,7 +1234,8 @@ void SimpleTargetRunner::doStart(const Runnable &runnable, const IDevice::ConstP
connect(&m_launcher, &ApplicationLauncher::appendMessage, this, &RunWorker::appendMessage);
const bool isDesktop = device.isNull() || device.dynamicCast<const DesktopDevice>();
const bool isDesktop = runnable.device.isNull()
|| runnable.device.dynamicCast<const DesktopDevice>();
if (isDesktop) {
connect(&m_launcher, &ApplicationLauncher::processStarted, this, [this] {
// Console processes only know their pid after being started
@@ -1248,9 +1252,7 @@ void SimpleTargetRunner::doStart(const Runnable &runnable, const IDevice::ConstP
} else {
connect(&m_launcher, &ApplicationLauncher::processStarted, this, &RunWorker::reportStarted);
}
Runnable runnableWithDevice = runnable;
runnableWithDevice.device = device;
m_launcher.setRunnable(runnableWithDevice);
m_launcher.setRunnable(runnable);
m_launcher.start();
}