diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2017-01-30 10:55:40 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-01-30 10:55:40 +0100 |
| commit | b299ff19ecefa2ea91fd4d3697cc1f0b8c67727f (patch) | |
| tree | 3f381fe4577709b76a1472f4ecea3019176d652b /src/plugins/git/gitplugin.cpp | |
| parent | 28d9c305adaa7ad55e1dd95bbcce0bab1e7e705d (diff) | |
| parent | 2def95374d018898a484e34eca2e66effe0ac7f6 (diff) | |
| download | qt-creator-b299ff19ecefa2ea91fd4d3697cc1f0b8c67727f.tar.gz | |
Merge remote-tracking branch 'origin/4.2'
Conflicts:
src/shared/qbs
Change-Id: Ic39fd1c411632f56312fae31c0c88ebc1098b5a4
Diffstat (limited to 'src/plugins/git/gitplugin.cpp')
| -rw-r--r-- | src/plugins/git/gitplugin.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp index a676bd065a..f2f5abbcfa 100644 --- a/src/plugins/git/gitplugin.cpp +++ b/src/plugins/git/gitplugin.cpp @@ -1062,10 +1062,12 @@ bool GitPlugin::submitEditorAboutToClose() m_gitClient->interactiveRebase(m_submitRepository, amendSHA1, true); } else { m_gitClient->continueCommandIfNeeded(m_submitRepository); - if (editor->panelData().pushAction == NormalPush) + if (editor->panelData().pushAction == NormalPush) { m_gitClient->push(m_submitRepository); - else if (editor->panelData().pushAction == PushToGerrit) - connect(editor, &QObject::destroyed, this, &GitPlugin::delayedPushToGerrit); + } else if (editor->panelData().pushAction == PushToGerrit) { + connect(editor, &QObject::destroyed, this, &GitPlugin::delayedPushToGerrit, + Qt::QueuedConnection); + } } return true; |