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

Merge remote-tracking branch 'origin/9.0'

Browse Source 
Change-Id: I5e6cfc111941f9609285e1b802121644fa8cdaac
This commit is contained in:
Orgad Shaneh
2022-10-18 21:59:53 +03:00
parent f1fc14acc9 ada6989079
commit 7edf743583
22 changed files with 113 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libs/utils/qtcprocess.cpp
View File

@@ -634,6 +634,8 @@ public:
void setProcessInterface(ProcessInterface *process)
{
if (m_process)
m_process->disconnect();
m_process.reset(process);
m_process->setParent(this);
connect(m_process.get(), &ProcessInterface::started,
@@ -805,6 +807,14 @@ GeneralProcessBlockingImpl::GeneralProcessBlockingImpl(QtcProcessPrivate *parent
// In order to move the process interface into another thread together with handle
parent->m_process.get()->setParent(m_processHandler.get());
m_processHandler->setParent(this);
// So the hierarchy looks like:
// QtcProcessPrivate
// |
// +- GeneralProcessBlockingImpl
// |
// +- ProcessInterfaceHandler
// |
// +- ProcessInterface
}
bool GeneralProcessBlockingImpl::waitForSignal(ProcessSignalType newSignal, int msecs)
@@ -998,6 +1008,8 @@ QtcProcess::~QtcProcess()
{
QTC_ASSERT(!d->m_guard.isLocked(), qWarning("Deleting QtcProcess instance directly from "
"one of its signal handlers will lead to crash!"));
if (d->m_process)
d->m_process->disconnect();
delete d;
}