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

Utils: Remove QtcProcess::{is,set}Synchronous

Browse Source 
This reverts a bit of fe8fbf1a4a which was over-shooting API-wise.

Change-Id: Iac4c2b9fa550f7ec0b0aa8deea8c3fc6b6ddcfba
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2021-05-06 15:38:12 +02:00
parent 4c09a6e6b2
commit ad5b34ab3e
3 changed files with 1 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -104,7 +104,6 @@ public:
bool m_lowPriority = false; bool m_lowPriority = false;
bool m_disableUnixTerminal = false; bool m_disableUnixTerminal = false;
bool m_synchronous = false;
QProcess::OpenMode m_openMode = QProcess::ReadWrite; QProcess::OpenMode m_openMode = QProcess::ReadWrite;
// SynchronousProcess left overs: // SynchronousProcess left overs:
@@ -263,9 +262,6 @@ void QtcProcess::start()
} }
QProcess::start(command, arguments.toUnixArgs(), d->m_openMode); QProcess::start(command, arguments.toUnixArgs(), d->m_openMode);
} }
if (d->m_synchronous)
QProcess::waitForFinished();
} }
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
@@ -349,16 +345,6 @@ void QtcProcessPrivate::setupChildProcess_impl()
#endif #endif
} }
bool QtcProcess::isSynchronous() const
{
return d->m_synchronous;
}
void QtcProcess::setSynchronous(bool on)
{
d->m_synchronous = on;
}
void QtcProcess::setOpenMode(OpenMode mode) void QtcProcess::setOpenMode(OpenMode mode)
{ {
d->m_openMode = mode; d->m_openMode = mode;

3
src/libs/utils/qtcprocess.h
View File

@@ -121,9 +121,6 @@ public:
static void setRemoteStartProcessHook(const std::function<void (QtcProcess &)> &hook); static void setRemoteStartProcessHook(const std::function<void (QtcProcess &)> &hook);
bool isSynchronous() const;
void setSynchronous(bool on);
void setOpenMode(OpenMode mode); void setOpenMode(OpenMode mode);
bool stopProcess(); bool stopProcess();

2
src/plugins/docker/dockerdevice.cpp
View File

@@ -663,8 +663,8 @@ int DockerDevicePrivate::runSynchronously(const CommandLine &cmd) const
QtcProcess proc; QtcProcess proc;
proc.setCommand(dcmd); proc.setCommand(dcmd);
proc.setWorkingDirectory("/tmp"); proc.setWorkingDirectory("/tmp");
proc.setSynchronous(true);
proc.start(); proc.start();
proc.waitForFinished();
LOG("Run sync:" << dcmd.toUserOutput() << " result: " << proc.exitCode()); LOG("Run sync:" << dcmd.toUserOutput() << " result: " << proc.exitCode());
return proc.exitCode(); return proc.exitCode();