forked from qt-creator/qt-creator
Utils: Rename QtcProcess -> Process
Task-number: QTCREATORBUG-29102 Change-Id: Ibc264f9db6a32206e4097766ee3f7d0b35225a5c Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
@@ -63,12 +63,12 @@ void MesonProcess::setupProcess(const Command &command, const Environment &env,
|
||||
{
|
||||
if (m_process)
|
||||
m_process.release()->deleteLater();
|
||||
m_process.reset(new QtcProcess);
|
||||
connect(m_process.get(), &QtcProcess::done, this, &MesonProcess::handleProcessDone);
|
||||
m_process.reset(new Process);
|
||||
connect(m_process.get(), &Process::done, this, &MesonProcess::handleProcessDone);
|
||||
if (!captureStdo) {
|
||||
connect(m_process.get(), &QtcProcess::readyReadStandardOutput,
|
||||
connect(m_process.get(), &Process::readyReadStandardOutput,
|
||||
this, &MesonProcess::processStandardOutput);
|
||||
connect(m_process.get(), &QtcProcess::readyReadStandardError,
|
||||
connect(m_process.get(), &Process::readyReadStandardError,
|
||||
this, &MesonProcess::processStandardError);
|
||||
}
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
namespace Utils {
|
||||
class Environment;
|
||||
class QtcProcess;
|
||||
class Process;
|
||||
}
|
||||
|
||||
namespace MesonProjectManager {
|
||||
@@ -44,7 +44,7 @@ private:
|
||||
void processStandardOutput();
|
||||
void processStandardError();
|
||||
|
||||
std::unique_ptr<Utils::QtcProcess> m_process;
|
||||
std::unique_ptr<Utils::Process> m_process;
|
||||
QElapsedTimer m_elapsed;
|
||||
QByteArray m_stdo;
|
||||
QByteArray m_stderr;
|
||||
|
||||
@@ -35,7 +35,7 @@ bool containsFiles(const QString &path, const File_t &file, const T &...files)
|
||||
|
||||
inline bool run_meson(const Command &command, QIODevice *output = nullptr)
|
||||
{
|
||||
Utils::QtcProcess process;
|
||||
Utils::Process process;
|
||||
process.setWorkingDirectory(command.workDir());
|
||||
process.setCommand(command.cmdLine());
|
||||
process.start();
|
||||
|
||||
@@ -40,7 +40,7 @@ void ToolWrapper::setExe(const Utils::FilePath &newExe)
|
||||
Version ToolWrapper::read_version(const Utils::FilePath &toolPath)
|
||||
{
|
||||
if (toolPath.toFileInfo().isExecutable()) {
|
||||
Utils::QtcProcess process;
|
||||
Utils::Process process;
|
||||
process.setCommand({ toolPath, { "--version" } });
|
||||
process.start();
|
||||
if (process.waitForFinished())
|
||||
|
||||
Reference in New Issue
Block a user