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

VCS[git]: Use QProcess::startDetached() if possible for gitk.

Browse Source 
Task-number: QTCREATORBUG-1577
This commit is contained in:
Friedemann Kleint
2010-06-08 16:02:11 +02:00
parent 7dc2760f0e
commit 33ec71adda
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/git/gitclient.cpp
View File

@@ -1279,18 +1279,25 @@ void GitClient::launchGitK(const QString &workingDirectory)
const QStringList arguments; const QStringList arguments;
#endif #endif
outwin->appendCommand(workingDirectory, binary, arguments); outwin->appendCommand(workingDirectory, binary, arguments);
// This should use QProcess::startDetached ideally, but that does not have // This should always use QProcess::startDetached (as not to kill
// an environment parameter. // the child), but that does not have an environment parameter.
bool success = false;
if (m_settings.adoptPath) {
QProcess *process = new QProcess(this); QProcess *process = new QProcess(this);
process->setWorkingDirectory(workingDirectory); process->setWorkingDirectory(workingDirectory);
process->setProcessEnvironment(env); process->setProcessEnvironment(env);
process->start(binary, arguments); process->start(binary, arguments);
if (!process->waitForStarted()) { success = process->waitForStarted();
outwin->appendError(tr("Unable to launch %1.").arg(binary)); if (success) {
delete process;
return;
}
connect(process, SIGNAL(finished(int)), process, SLOT(deleteLater())); connect(process, SIGNAL(finished(int)), process, SLOT(deleteLater()));
} else {
delete process;
}
} else {
success = QProcess::startDetached(binary, arguments, workingDirectory);
}
if (!success)
outwin->appendError(tr("Unable to launch %1.").arg(binary));
} }
bool GitClient::getCommitData(const QString &workingDirectory, bool GitClient::getCommitData(const QString &workingDirectory,