Merge branch 'master' of [email protected]:creator/mainline

Conflicts:
	src/plugins/perforce/perforceplugin.cpp

1 files changed, 4 insertions, 4 deletions

diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 44ee65bce0f..e20ee11f965 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -97,10 +97,10 @@ static QString formatCommand(const QString &binary, const QStringList &args)
 }
 
 // ---------------- GitClient
-GitClient::GitClient(GitPlugin* plugin, Core::ICore *core) :
-    m_msgWait(tr("Waiting for data...")),
+GitClient::GitClient(GitPlugin* plugin)
+  : m_msgWait(tr("Waiting for data...")),
     m_plugin(plugin),
-    m_core(core)
+    m_core(Core::ICore::instance())
 {
     if (QSettings *s = m_core->settings())
         m_settings.fromSettings(s);
@@ -178,7 +178,7 @@ VCSBase::VCSBaseEditor
         QTC_ASSERT(rc, return 0);
         rc->setSource(source);
         if (setSourceCodec)
-            rc->setCodec(VCSBase::VCSBaseEditor::getCodec(m_core, source));
+            rc->setCodec(VCSBase::VCSBaseEditor::getCodec(source));
     }
     return rc;
 }