diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 13b2f80cdce3a11b016ba98415cd48bbf3b60ee9..bd3cd9d2dfd696b5d1b7a82d168be6ae257a20a1 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 6cb8703cc08a1b815fb16b22e042868672db69b7..1868b1ff04fce50208dde273b9f81cf41947b192 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