diff options
| author | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2015-09-02 17:02:08 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2015-09-03 08:23:03 +0000 |
| commit | 1381b80f4bc529a39c7f89a629204a2d6f185d19 (patch) | |
| tree | 800dc26ac85d0c03243ecf26bfe80662e86d47d5 | |
| parent | 91848f47559db244c9981e97967369e60425e7e6 (diff) | |
| download | qt-creator-1381b80f4bc529a39c7f89a629204a2d6f185d19.tar.gz | |
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>
| -rw-r--r-- | src/plugins/mercurial/mercurialplugin.cpp | 4 | ||||
| -rw-r--r-- | 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 bedaa8adcf..e189ec132f 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 e2386e78ad..ac76395f76 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; |