From 1381b80f4bc529a39c7f89a629204a2d6f185d19 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@theqtcompany.com>
Date: Wed, 2 Sep 2015 17:02:08 +0200
Subject: [PATCH] Mercurial: Make commiter/commiter email work again

We tried to get the data from a settings object that was removed
elsewhere:-/

Task-number: QTCREATORBUG-14945
Change-Id: Ib7c1b9ced0cae776f24f250ebda24bcf14d3a782
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
---
 src/plugins/mercurial/mercurialplugin.cpp | 4 ++--
 src/plugins/mercurial/mercurialplugin.h   | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/plugins/mercurial/mercurialplugin.cpp b/src/plugins/mercurial/mercurialplugin.cpp
index bedaa8adcfc..e189ec132f6 100644
--- a/src/plugins/mercurial/mercurialplugin.cpp
+++ b/src/plugins/mercurial/mercurialplugin.cpp
@@ -560,8 +560,8 @@ void MercurialPlugin::showCommitWidget(const QList<VcsBaseClient::StatusItem> &s
 
     QString branch = versionControl()->vcsTopic(m_submitRepository);
     commitEditor->setFields(m_submitRepository, branch,
-                            mercurialSettings.stringValue(MercurialSettings::userNameKey),
-                            mercurialSettings.stringValue(MercurialSettings::userEmailKey), status);
+                            m_client->settings().stringValue(MercurialSettings::userNameKey),
+                            m_client->settings().stringValue(MercurialSettings::userEmailKey), status);
 }
 
 void MercurialPlugin::diffFromEditorSelected(const QStringList &files)
diff --git a/src/plugins/mercurial/mercurialplugin.h b/src/plugins/mercurial/mercurialplugin.h
index e2386e78ad8..ac76395f76d 100644
--- a/src/plugins/mercurial/mercurialplugin.h
+++ b/src/plugins/mercurial/mercurialplugin.h
@@ -135,7 +135,6 @@ private:
 
     // Variables
     static MercurialPlugin *m_instance;
-    MercurialSettings mercurialSettings;
     OptionsPage *optionsPage;
     MercurialClient *m_client;