summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2016-09-03 23:29:06 +0300
committerOrgad Shaneh <orgads@gmail.com>2016-09-18 19:00:26 +0000
commit9ee955acb70c5b5044080755d98d1a9e20a3d6cc (patch)
tree94c99f263064e95f341dd0a776fe159fe5dea97e /src
parent1ff9c71b6508a6c0e757b630000fd6cdca83f746 (diff)
downloadqt-creator-9ee955acb70c5b5044080755d98d1a9e20a3d6cc.tar.gz
VCS: Only accept commit on Ctrl+Enter when enabled
Task-number: QTCREATORBUG-16808 Change-Id: I08442b027a6af300b2786e4510177bc050887ada Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/vcsbase/submiteditorwidget.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/plugins/vcsbase/submiteditorwidget.cpp b/src/plugins/vcsbase/submiteditorwidget.cpp
index c957aadf5f..c9d441c61f 100644
--- a/src/plugins/vcsbase/submiteditorwidget.cpp
+++ b/src/plugins/vcsbase/submiteditorwidget.cpp
@@ -242,7 +242,11 @@ void SubmitEditorWidget::registerActions(QAction *editorUndoAction, QAction *edi
d->m_ui.buttonLayout->addWidget(d->m_submitButton);
if (!d->m_submitShortcut)
d->m_submitShortcut = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_Return), this);
- connect(d->m_submitShortcut, &QShortcut::activated, submitAction, &QAction::trigger);
+ connect(d->m_submitShortcut, &QShortcut::activated,
+ submitAction, [submitAction] {
+ if (submitAction->isEnabled())
+ submitAction->trigger();
+ });
}
if (diffAction) {
if (debug)