From 541e61612acb215ba6174aa59b30b4269e5607ba Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Wed, 5 Oct 2011 14:20:14 +0000
Subject: [PATCH] Fix rebase issue and warning

Change-Id: Ic3b062c8be71887e00b6cfef2a52c61260c2e0ef
Reviewed-on: http://codereview.qt-project.org/6073
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
---
 src/plugins/git/gitclient.cpp   | 2 +-
 src/plugins/git/gitsettings.cpp | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 13b2f80cdce..bd3cd9d2dfd 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -1255,7 +1255,7 @@ bool GitClient::synchronousApplyPatch(const QString &workingDirectory,
 // Factory function to create an asynchronous command
 GitCommand *GitClient::createCommand(const QString &workingDirectory,
                                      VCSBase::VCSBaseEditorWidget* editor,
-                                     bool outputToWindow,
+                                     bool useOutputToWindow,
                                      int editorLineNumber)
 {
     GitCommand *command = new GitCommand(gitBinaryPath(), workingDirectory, processEnvironment(), QVariant(editorLineNumber));
diff --git a/src/plugins/git/gitsettings.cpp b/src/plugins/git/gitsettings.cpp
index 6cb8703cc08..1868b1ff04f 100644
--- a/src/plugins/git/gitsettings.cpp
+++ b/src/plugins/git/gitsettings.cpp
@@ -106,6 +106,7 @@ GitSettings &GitSettings::operator = (const GitSettings &s)
 {
     VCSBaseClientSettings::operator =(s);
     m_binaryPath.clear();
+    return *this;
 }
 
 } // namespace Internal