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

Merge remote-tracking branch 'origin/5.0'

Browse Source 
Conflicts:
	src/libs/utils/processreaper.cpp
	src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
	src/plugins/cmakeprojectmanager/cmakeprocess.cpp

Change-Id: Ie248bcb02a80f3e02ab19d73033ce2ba31e7fd83
This commit is contained in:
Eike Ziller
2021-09-07 08:56:42 +02:00
parent d739ba8a7d 93857c279c
commit 8e51295959
101 changed files with 1050 additions and 663 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/libs/utils/processreaper.cpp
View File

@@ -157,7 +157,6 @@ void ProcessReaper::reap(QProcess *process, int timeoutMs)
QTC_ASSERT(QThread::currentThread() == process->thread(), return);
process->disconnect();
process->setParent(nullptr);
if (process->state() == QProcess::NotRunning) {
process->deleteLater();
return;