From a403c3f3ca8357cbd381fce41da5568824cb0a9f Mon Sep 17 00:00:00 2001 From: David Edmundson Date: Wed, 5 Mar 2014 23:20:01 +0100 Subject: [PATCH] Don't check for conflicts when first setting keyboard shortcut --- .../kquickcontrols/private/keysequencehelper.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/declarativeimports/kquickcontrols/private/keysequencehelper.cpp b/src/declarativeimports/kquickcontrols/private/keysequencehelper.cpp index fcb3d742c..43968da65 100644 --- a/src/declarativeimports/kquickcontrols/private/keysequencehelper.cpp +++ b/src/declarativeimports/kquickcontrols/private/keysequencehelper.cpp @@ -267,7 +267,8 @@ void KeySequenceHelper::setKeySequence(const QKeySequence& sequence) d->oldKeySequence = d->keySequence; } d->keySequence = sequence; - doneRecording(); + d->updateShortcutDisplay(); + emit keySequenceChanged(d->keySequence); }