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

ProjectExplorer: Extend ApplicationLauncher

Browse Source 
Implement some more QProcess functions

Change-Id: I1afe3fa5f5b353508cf300178cb50507b3dd4b3e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Orgad Shaneh
2014-05-04 23:10:17 +03:00
committed by Orgad Shaneh
parent 28b512df44
commit 6886d0ac60
7 changed files with 90 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/libs/utils/consoleprocess_unix.cpp
View File

@@ -50,6 +50,7 @@ ConsoleProcessPrivate::ConsoleProcessPrivate() :
m_appPid(0),
m_stubSocket(0),
m_tempFile(0),
m_error(QProcess::UnknownError),
m_settings(0),
m_stubConnected(false),
m_stubPid(0),
@@ -80,6 +81,9 @@ bool ConsoleProcess::start(const QString &program, const QString &args)
if (isRunning())
return false;
d->m_errorString.clear();
d->m_error = QProcess::UnknownError;
QtcProcess::SplitError perr;
QtcProcess::Arguments pargs = QtcProcess::prepareArgs(args, &perr, HostOsInfo::hostOs(),
&d->m_environment, &d->m_workingDir);
@@ -88,12 +92,12 @@ bool ConsoleProcess::start(const QString &program, const QString &args)
pcmd = program;
} else {
if (perr != QtcProcess::FoundMeta) {
emit processError(tr("Quoting error in command."));
emitError(QProcess::FailedToStart, tr("Quoting error in command."));
return false;
}
if (d->m_mode == Debug) {
// FIXME: QTCREATORBUG-2809
emit processError(tr("Debugging complex shell commands in a terminal"
emitError(QProcess::FailedToStart, tr("Debugging complex shell commands in a terminal"
" is currently not supported."));
return false;
}
@@ -108,7 +112,7 @@ bool ConsoleProcess::start(const QString &program, const QString &args)
HostOsInfo::hostOs(),
&d->m_environment, &d->m_workingDir);
if (qerr != QtcProcess::SplitOk) {
emit processError(qerr == QtcProcess::BadQuoting
emitError(QProcess::FailedToStart, qerr == QtcProcess::BadQuoting
? tr("Quoting error in terminal command.")
: tr("Terminal command may not be a shell command."));
return false;
@@ -116,7 +120,7 @@ bool ConsoleProcess::start(const QString &program, const QString &args)
const QString err = stubServerListen();
if (!err.isEmpty()) {
emit processError(msgCommChannelFailed(err));
emitError(QProcess::FailedToStart, msgCommChannelFailed(err));
return false;
}
@@ -125,7 +129,7 @@ bool ConsoleProcess::start(const QString &program, const QString &args)
d->m_tempFile = new QTemporaryFile();
if (!d->m_tempFile->open()) {
stubServerShutdown();
emit processError(msgCannotCreateTempFile(d->m_tempFile->errorString()));
emitError(QProcess::FailedToStart, msgCannotCreateTempFile(d->m_tempFile->errorString()));
delete d->m_tempFile;
d->m_tempFile = 0;
return false;
@@ -137,7 +141,7 @@ bool ConsoleProcess::start(const QString &program, const QString &args)
}
if (d->m_tempFile->write(contents) != contents.size() || !d->m_tempFile->flush()) {
stubServerShutdown();
emit processError(msgCannotWriteTempFile());
emitError(QProcess::FailedToStart, msgCannotWriteTempFile());
delete d->m_tempFile;
d->m_tempFile = 0;
return false;
@@ -163,7 +167,7 @@ bool ConsoleProcess::start(const QString &program, const QString &args)
d->m_process.start(xterm, allArgs);
if (!d->m_process.waitForStarted()) {
stubServerShutdown();
emit processError(tr("Cannot start the terminal emulator \"%1\", change the setting in the "
emitError(QProcess::UnknownError, tr("Cannot start the terminal emulator \"%1\", change the setting in the "
"Environment options.").arg(xterm));
delete d->m_tempFile;
d->m_tempFile = 0;
@@ -290,9 +294,9 @@ void ConsoleProcess::readStubOutput()
QByteArray out = d->m_stubSocket->readLine();
out.chop(1); // \n
if (out.startsWith("err:chdir ")) {
emit processError(msgCannotChangeToWorkDir(workingDirectory(), errorMsg(out.mid(10).toInt())));
emitError(QProcess::FailedToStart, msgCannotChangeToWorkDir(workingDirectory(), errorMsg(out.mid(10).toInt())));
} else if (out.startsWith("err:exec ")) {
emit processError(msgCannotExecute(d->m_executable, errorMsg(out.mid(9).toInt())));
emitError(QProcess::FailedToStart, msgCannotExecute(d->m_executable, errorMsg(out.mid(9).toInt())));
} else if (out.startsWith("spid ")) {
delete d->m_tempFile;
d->m_tempFile = 0;
@@ -312,7 +316,7 @@ void ConsoleProcess::readStubOutput()
d->m_appPid = 0;
emit processStopped(d->m_appCode, d->m_appStatus);
} else {
emit processError(msgUnexpectedOutput(out));
emitError(QProcess::UnknownError, msgUnexpectedOutput(out));
d->m_stubPid = 0;
d->m_process.terminate();
break;