forked from qt-creator/qt-creator
QtcProcess: Limit the inclusion of qtcprocess.h
Move the rest of QtcProcess enums to processenums.h. Move ExitCodeInterpreter into processenums.h. Remove superfluous Utils:: prefix. Change-Id: Iaa596f353d33d6930085a621b114cc15a35caa80 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
@@ -1673,7 +1673,7 @@ ClearCasePluginPrivate::runCleartool(const FilePath &workingDir,
|
||||
command.setCodec(outputCodec);
|
||||
command.runCommand(proc, {FilePath::fromString(executable), arguments});
|
||||
|
||||
response.error = proc.result() != QtcProcess::FinishedWithSuccess;
|
||||
response.error = proc.result() != ProcessResult::FinishedWithSuccess;
|
||||
if (response.error)
|
||||
response.message = proc.exitMessage();
|
||||
response.stdErr = proc.stdErr();
|
||||
@@ -2354,8 +2354,8 @@ QString ClearCasePluginPrivate::runExtDiff(const FilePath &workingDir, const QSt
|
||||
process.setWorkingDirectory(workingDir);
|
||||
process.setCodec(outputCodec ? outputCodec : QTextCodec::codecForName("UTF-8"));
|
||||
process.setCommand(diff);
|
||||
process.runBlocking(QtcProcess::WithEventLoop);
|
||||
if (process.result() != QtcProcess::FinishedWithSuccess)
|
||||
process.runBlocking(EventLoopMode::On);
|
||||
if (process.result() != ProcessResult::FinishedWithSuccess)
|
||||
return QString();
|
||||
return process.allOutput();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user