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

Merge remote-tracking branch 'origin/6.0'

Browse Source 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/clangcodemodel/clangdclient.cpp

Change-Id: I75c954d2e573d65089205d2542747bba3276be2a
This commit is contained in:
Eike Ziller
2022-01-03 14:14:12 +01:00
parent ea13ade822 cf5fc98a2c
commit 7d92375b2f
21 changed files with 159 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -314,17 +314,18 @@ public:
{ m_process->setWorkingDirectory(dir); }
void start(const QString &program, const QStringList &arguments, const QByteArray &writeData) override
{
m_processStartHandler.setProcessMode(processMode());
m_processStartHandler.setWriteData(writeData);
ProcessStartHandler *handler = m_process->processStartHandler();
handler->setProcessMode(processMode());
handler->setWriteData(writeData);
if (isBelowNormalPriority())
m_processStartHandler.setBelowNormalPriority(m_process);
m_processStartHandler.setNativeArguments(m_process, nativeArguments());
handler->setBelowNormalPriority();
handler->setNativeArguments(nativeArguments());
if (isLowPriority())
m_process->setLowPriority();
if (isUnixTerminalDisabled())
m_process->setUnixTerminalDisabled();
m_process->start(program, arguments, m_processStartHandler.openMode());
m_processStartHandler.handleProcessStart(m_process);
m_process->start(program, arguments, handler->openMode());
handler->handleProcessStart();
}
void terminate() override
{ m_process->terminate(); }
@@ -367,11 +368,10 @@ public:
private:
void handleStarted()
{
m_processStartHandler.handleProcessStarted(m_process);
m_process->processStartHandler()->handleProcessStarted();
emit started();
}
ProcessHelper *m_process;
ProcessStartHandler m_processStartHandler;
};
static uint uniqueToken()