diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-07-08 15:01:17 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-07-08 15:01:17 +0200 |
| commit | a98fe15fe51a87e2943623caf2a8ea072cfc5919 (patch) | |
| tree | cd591ee60c464a385c02a92bcaba34ccdeadcd2e /src/plugins/git/gitplugin.cpp | |
| parent | 2c211007257f5e58e2809692b74bb5b18f63b80c (diff) | |
| parent | 07c0a8348c59945465e9f2330a40f625543f7f8a (diff) | |
| download | qt-creator-a98fe15fe51a87e2943623caf2a8ea072cfc5919.tar.gz | |
Merge remote-tracking branch 'origin/2.8' into HEAD
Conflicts:
qbs/pluginspec/pluginspec.qbs
Change-Id: Ic8e992623b9eda8913ee473c779a8df27643ccc9
Diffstat (limited to 'src/plugins/git/gitplugin.cpp')
| -rw-r--r-- | src/plugins/git/gitplugin.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp index 450a0ddf94..ff7ccd8ed2 100644 --- a/src/plugins/git/gitplugin.cpp +++ b/src/plugins/git/gitplugin.cpp @@ -695,6 +695,8 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage) connect(Core::ICore::vcsManager(), SIGNAL(repositoryChanged(QString)), this, SLOT(updateContinueAndAbortCommands())); + connect(Core::ICore::vcsManager(), SIGNAL(repositoryChanged(QString)), + this, SLOT(updateBranches(QString)), Qt::QueuedConnection); if (!Core::ICore::mimeDatabase()->addMimeTypes(QLatin1String(RC_GIT_MIME_XML), errorMessage)) return false; @@ -1435,6 +1437,12 @@ void GitPlugin::updateContinueAndAbortCommands() } } +void GitPlugin::updateBranches(const QString &repository) +{ + if (m_branchDialog && m_branchDialog->isVisible()) + m_branchDialog->refreshIfSame(repository); +} + void GitPlugin::updateRepositoryBrowserAction() { const bool repositoryEnabled = currentState().hasTopLevel(); |