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

Compile fixes for Qt 4.8

Browse Source 
Change-Id: Ie28d5901fe27fec4f928204296bf1013e10c556a
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Robert Loehning
2014-08-13 17:22:07 +02:00
committed by Daniel Teske
parent efcb802203
commit eb1ce50779
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -217,7 +217,7 @@ void GitDiffHandler::postCollectShowDescription(const QString &id)
return;
}
m_controller->saveStateRequested();
m_controller->requestSaveState();
m_controller->clear(m_waitMessage);
VcsBase::Command *command = new VcsBase::Command(gitPath(),
m_workingDirectory,
@@ -305,7 +305,7 @@ void GitDiffHandler::postCollectTextualDiffOutput(const QString &gitCommand, con
return;
}
m_controller->saveStateRequested();
m_controller->requestSaveState();
m_controller->clear(m_waitMessage);
VcsBase::Command *command = new VcsBase::Command(gitPath(),
m_workingDirectory,
@@ -333,7 +333,7 @@ void GitDiffHandler::slotTextualDiffOutputReceived(const QString &contents)
= DiffEditor::DiffUtils::readPatch(
contents, m_controller->isIgnoreWhitespace(), &ok);
m_controller->setDiffFiles(fileDataList, m_workingDirectory);
m_controller->restoreStateRequested();
m_controller->requestRestoreState();
deleteLater();
}