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

Merge remote-tracking branch 'origin/3.2'

Browse Source 
Conflicts:
	src/plugins/git/gerrit/gerritparameters.cpp
	src/plugins/git/gerrit/gerritplugin.h
	src/plugins/git/gitclient.cpp

Change-Id: Ie7719cfe45489b72d64260e729dcce3760f33bec
This commit is contained in:
Eike Ziller
2014-07-17 12:42:04 +02:00
parent 98a88b0b84 0c00f44a2d
commit e7ea94b688
143 changed files with 1202 additions and 623 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/vcsbase/vcsbaseplugin.cpp
View File

@@ -237,9 +237,8 @@ void StateListener::slotStateChanged()
state.currentFile.clear();
} else {
state.currentFile = currentDocument->filePath();
if (state.currentFile.isEmpty()) {
if (state.currentFile.isEmpty() || currentDocument->isTemporary())
state.currentFile = VcsBasePlugin::source(currentDocument);
}
}
QScopedPointer<QFileInfo> currentFileInfo; // Instantiate QFileInfo only once if required.
if (!state.currentFile.isEmpty()) {