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

Merge remote-tracking branch 'origin/2.7'

Browse Source 
Conflicts:
	src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp

Change-Id: I4e0a85795e7f4bfcdc21d106517517b527f85104
This commit is contained in:
Eike Ziller
2013-04-30 11:43:33 +02:00
parent 3aa0e50039 71f1919de9
commit bedc477943
39 changed files with 267 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/git/giteditor.cpp
View File

@@ -180,7 +180,7 @@ void GitEditor::setPlainTextDataFiltered(const QByteArray &a)
}
case VcsBase::DiffOutput: {
const QFileInfo fi(source());
const QString workingDirectory = fi.absolutePath();
const QString workingDirectory = fi.isDir() ? fi.absoluteFilePath() : fi.absolutePath();
QByteArray precedes, follows;
if (array.startsWith("commit ")) { // show
int lastHeaderLine = array.indexOf("\n\n") + 1;