diff options
| author | Maciej Czarnecki <mcczarny@gmail.com> | 2017-08-21 13:28:51 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-24 16:43:52 +0000 |
| commit | 3b8f828174f08d9037a0947b8709648ac37cdc36 (patch) | |
| tree | b494b0aa1121154b2b29136f31ef5806907a1c63 /src/widgets/dialogs | |
| parent | abcf558e49d5e8c20eda14badc30e93e2e9cba32 (diff) | |
| download | qtbase-3b8f828174f08d9037a0947b8709648ac37cdc36.tar.gz | |
QWizard: Do not remove the Next button's shortcut
Currently on Windows, the Next button's shortcut doesn't work, because
QWizard overrides it with an empty key sequence.
The key sequence should be changed only if isVistaThemeEnabled() returns
true.
Task-number: QTBUG-46894
Change-Id: I54f26388b167973cc8065a867d9e771c1e6a2a72
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/widgets/dialogs')
| -rw-r--r-- | src/widgets/dialogs/qwizard.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/dialogs/qwizard.cpp b/src/widgets/dialogs/qwizard.cpp index 1984cb0a89..a4ea7ae8de 100644 --- a/src/widgets/dialogs/qwizard.cpp +++ b/src/widgets/dialogs/qwizard.cpp @@ -1468,8 +1468,8 @@ void QWizardPrivate::updateButtonTexts() // even in RTL mode, so do the same, even if it might be counter-intuitive. // The shortcut for 'back' is set in class QVistaBackButton. #if QT_CONFIG(shortcut) - if (btns[QWizard::NextButton]) - btns[QWizard::NextButton]->setShortcut(isVistaThemeEnabled() ? QKeySequence(Qt::ALT | Qt::Key_Right) : QKeySequence()); + if (btns[QWizard::NextButton] && isVistaThemeEnabled()) + btns[QWizard::NextButton]->setShortcut(QKeySequence(Qt::ALT | Qt::Key_Right)); #endif } |