forked from qt-creator/qt-creator
Utils: Remove QtcProcess::{is,set}Synchronous
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:
@@ -104,7 +104,6 @@ public:
|
||||
bool m_lowPriority = false;
|
||||
bool m_disableUnixTerminal = false;
|
||||
|
||||
bool m_synchronous = false;
|
||||
QProcess::OpenMode m_openMode = QProcess::ReadWrite;
|
||||
|
||||
// SynchronousProcess left overs:
|
||||
@@ -263,9 +262,6 @@ void QtcProcess::start()
|
||||
}
|
||||
QProcess::start(command, arguments.toUnixArgs(), d->m_openMode);
|
||||
}
|
||||
|
||||
if (d->m_synchronous)
|
||||
QProcess::waitForFinished();
|
||||
}
|
||||
|
||||
#ifdef Q_OS_WIN
|
||||
@@ -349,16 +345,6 @@ void QtcProcessPrivate::setupChildProcess_impl()
|
||||
#endif
|
||||
}
|
||||
|
||||
bool QtcProcess::isSynchronous() const
|
||||
{
|
||||
return d->m_synchronous;
|
||||
}
|
||||
|
||||
void QtcProcess::setSynchronous(bool on)
|
||||
{
|
||||
d->m_synchronous = on;
|
||||
}
|
||||
|
||||
void QtcProcess::setOpenMode(OpenMode mode)
|
||||
{
|
||||
d->m_openMode = mode;
|
||||
|
@@ -121,9 +121,6 @@ public:
|
||||
|
||||
static void setRemoteStartProcessHook(const std::function<void (QtcProcess &)> &hook);
|
||||
|
||||
bool isSynchronous() const;
|
||||
void setSynchronous(bool on);
|
||||
|
||||
void setOpenMode(OpenMode mode);
|
||||
|
||||
bool stopProcess();
|
||||
|
@@ -663,8 +663,8 @@ int DockerDevicePrivate::runSynchronously(const CommandLine &cmd) const
|
||||
QtcProcess proc;
|
||||
proc.setCommand(dcmd);
|
||||
proc.setWorkingDirectory("/tmp");
|
||||
proc.setSynchronous(true);
|
||||
proc.start();
|
||||
proc.waitForFinished();
|
||||
|
||||
LOG("Run sync:" << dcmd.toUserOutput() << " result: " << proc.exitCode());
|
||||
return proc.exitCode();
|
||||
|
Reference in New Issue
Block a user