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

Fix rebase issue and warning

Browse Source 
Change-Id: Ic3b062c8be71887e00b6cfef2a52c61260c2e0ef
Reviewed-on: http://codereview.qt-project.org/6073
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
Tobias Hunger
2011-10-05 14:20:14 +00:00
parent 363b230abf
commit 541e61612a
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1255,7 +1255,7 @@ bool GitClient::synchronousApplyPatch(const QString &workingDirectory,
// Factory function to create an asynchronous command // Factory function to create an asynchronous command
GitCommand *GitClient::createCommand(const QString &workingDirectory, GitCommand *GitClient::createCommand(const QString &workingDirectory,
VCSBase::VCSBaseEditorWidget* editor, VCSBase::VCSBaseEditorWidget* editor,
bool outputToWindow, bool useOutputToWindow,
int editorLineNumber) int editorLineNumber)
{ {
GitCommand *command = new GitCommand(gitBinaryPath(), workingDirectory, processEnvironment(), QVariant(editorLineNumber)); GitCommand *command = new GitCommand(gitBinaryPath(), workingDirectory, processEnvironment(), QVariant(editorLineNumber));

1
src/plugins/git/gitsettings.cpp
View File

@@ -106,6 +106,7 @@ GitSettings &GitSettings::operator = (const GitSettings &s)
{ {
VCSBaseClientSettings::operator =(s); VCSBaseClientSettings::operator =(s);
m_binaryPath.clear(); m_binaryPath.clear();
return *this;
} }
} // namespace Internal } // namespace Internal