diff options
Diffstat (limited to 'src/plugins/qmakeprojectmanager')
-rw-r--r-- | src/plugins/qmakeprojectmanager/qmakeproject.cpp | 8 | ||||
-rw-r--r-- | src/plugins/qmakeprojectmanager/qmakestep.cpp | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp index 3846ce2eb82..a78c001283f 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp @@ -1593,12 +1593,12 @@ void QmakeBuildSystem::runGenerator(Utils::Id id) showError(Tr::tr("Cannot create output directory \"%1\"").arg(outDir.toUserOutput())); return; } - const auto proc = new QtcProcess(this); - connect(proc, &QtcProcess::done, proc, &QtcProcess::deleteLater); - connect(proc, &QtcProcess::readyReadStandardOutput, this, [proc] { + const auto proc = new Process(this); + connect(proc, &Process::done, proc, &Process::deleteLater); + connect(proc, &Process::readyReadStandardOutput, this, [proc] { Core::MessageManager::writeFlashing(QString::fromLocal8Bit(proc->readAllRawStandardOutput())); }); - connect(proc, &QtcProcess::readyReadStandardError, this, [proc] { + connect(proc, &Process::readyReadStandardError, this, [proc] { Core::MessageManager::writeDisrupting(QString::fromLocal8Bit(proc->readAllRawStandardError())); }); proc->setWorkingDirectory(outDir); diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp index 7271e1f6e2f..d8e99a39a54 100644 --- a/src/plugins/qmakeprojectmanager/qmakestep.cpp +++ b/src/plugins/qmakeprojectmanager/qmakestep.cpp @@ -284,14 +284,14 @@ void QMakeStep::doRun() using namespace Tasking; - const auto setupQMake = [this](QtcProcess &process) { + const auto setupQMake = [this](Process &process) { m_outputFormatter->setLineParsers({new QMakeParser}); ProcessParameters *pp = processParameters(); pp->setCommandLine(m_qmakeCommand); setupProcess(&process); }; - const auto setupMakeQMake = [this](QtcProcess &process) { + const auto setupMakeQMake = [this](Process &process) { auto *parser = new GnuMakeParser; parser->addSearchDir(processParameters()->workingDirectory()); m_outputFormatter->setLineParsers({parser}); @@ -300,13 +300,13 @@ void QMakeStep::doRun() setupProcess(&process); }; - const auto onDone = [this](const QtcProcess &) { + const auto onDone = [this](const Process &) { const QString command = displayedParameters()->effectiveCommand().toUserOutput(); emit addOutput(Tr::tr("The process \"%1\" exited normally.").arg(command), OutputFormat::NormalMessage); }; - const auto onError = [this](const QtcProcess &process) { + const auto onError = [this](const Process &process) { const QString command = displayedParameters()->effectiveCommand().toUserOutput(); if (process.result() == ProcessResult::FinishedWithError) { emit addOutput(Tr::tr("The process \"%1\" exited with code %2.") |