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

Merge remote-tracking branch 'origin/3.0'

Browse Source
This commit is contained in:
Eike Ziller
2013-11-22 09:11:51 +01:00
parent 759fd36a1e cf3a9b0192
commit 559e66cb35
105 changed files with 2534 additions and 463 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/clearcase/clearcaseplugin.cpp
View File

@@ -1551,7 +1551,7 @@ bool ClearCasePlugin::vcsOpen(const QString &workingDir, const QString &fileName
QFile::rename(absPath + QLatin1String(".hijack"), absPath);
}
if ((!response.error || response.stdOut.contains(QLatin1String("already checked out")))
if ((!response.error || response.stdErr.contains(QLatin1String("already checked out")))
&& !m_settings.disableIndexer) {
setStatus(absPath, FileStatus::CheckedOut);
}
@@ -1683,7 +1683,7 @@ bool ClearCasePlugin::ccFileOp(const QString &workingDir, const QString &title,
runCleartool(workingDir, args, m_settings.timeOutMS(),
ShowStdOutInLogWindow | FullySynchronously);
if (coResponse.error) {
if (coResponse.stdOut.contains(QLatin1String("already checked out")))
if (coResponse.stdErr.contains(QLatin1String("already checked out")))
noCheckout = true;
else
return false;