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

Handle setNativeArguments inside process launcher

Browse Source 
Change-Id: I4b4db2e5cf6b3ad4d8a39614573564145f125520
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2021-08-09 12:57:22 +02:00
parent 8fa1a1f587
commit 4e06d3ac74
8 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -138,10 +138,8 @@ public:
void setBelowNormalPriority() { m_belowNormalPriority = true; }
bool isBelowNormalPriority() const { return m_belowNormalPriority; }
#ifdef Q_OS_WIN
virtual void setNativeArguments(const QString &arguments) = 0;
#endif
void setNativeArguments(const QString &arguments) { m_nativeArguments = arguments; }
QString nativeArguments() const { return m_nativeArguments; }
signals:
void started();
@@ -155,6 +153,7 @@ protected:
private:
const ProcessMode m_processMode;
bool m_belowNormalPriority = false;
QString m_nativeArguments;
};
class ProcessHelper : public QProcess
@@ -223,6 +222,7 @@ public:
m_processStartHandler.setWriteData(writeData);
if (isBelowNormalPriority())
m_processStartHandler.setBelowNormalPriority(&m_process);
m_processStartHandler.setNativeArguments(&m_process, nativeArguments());
m_process.start(program, arguments, m_processStartHandler.openMode());
m_processStartHandler.handleProcessStart(&m_process);
}
@@ -269,11 +269,6 @@ public:
void setDisableUnixTerminal() override
{ m_process.m_disableUnixTerminal = true; }
#ifdef Q_OS_WIN
void setNativeArguments(const QString &arguments) override
{ m_process.setNativeArguments(arguments); }
#endif
private:
void handleStarted()
{
@@ -325,6 +320,7 @@ public:
{
if (isBelowNormalPriority())
m_handle->setBelowNormalPriority();
m_handle->setNativeArguments(nativeArguments());
m_handle->start(program, arguments, writeData);
}
void terminate() override { cancel(); } // TODO: what are differences among terminate, kill and close?
@@ -351,10 +347,6 @@ public:
bool lowPriority() const override { QTC_CHECK(false); return false; }
void setDisableUnixTerminal() override { QTC_CHECK(false); }
#ifdef Q_OS_WIN
void setNativeArguments(const QString &arguments) override { QTC_CHECK(false); }
#endif
private:
typedef void (ProcessLauncherImpl::*PreSignal)(void);