diff options
| author | Kai Uwe Broulik <kde@privat.broulik.de> | 2017-06-21 10:49:59 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2017-07-15 16:59:49 +0000 |
| commit | 184d80f5a0d6764745ab77487620eb41679226f0 (patch) | |
| tree | 3b5b31e5b2c7e6e524f269a25131f7aa587f4115 /src/widgets/widgets/qdialogbuttonbox.cpp | |
| parent | 773178900f39febb0509cb4170bc091c9f91d3b3 (diff) | |
QDialogButtonBox: Don't overwrite shortcut with standardButtonShortcut
de63bbd2f806b0219a60775017899cedb121581f introduced a new
QPlatformTheme::standardButtonShortcut which would then unconditionally
overwrite the QPushButton shortcut, even when empty, breaking activating
mnemonics potentially included in the button's text.
Task-number: QTBUG-61197
Change-Id: I2a5a460a820a5ab4054eb44f349066aaeca1436f
Reviewed-by: Marco Martin <notmart@gmail.com>
Reviewed-by: Alexander Volkov <a.volkov@rusbitech.ru>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/widgets/widgets/qdialogbuttonbox.cpp')
| -rw-r--r-- | src/widgets/widgets/qdialogbuttonbox.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/widgets/widgets/qdialogbuttonbox.cpp b/src/widgets/widgets/qdialogbuttonbox.cpp index a3e55114bb..90cb17da59 100644 --- a/src/widgets/widgets/qdialogbuttonbox.cpp +++ b/src/widgets/widgets/qdialogbuttonbox.cpp @@ -411,7 +411,9 @@ QPushButton *QDialogButtonBoxPrivate::createButton(QDialogButtonBox::StandardBut else addButton(button, static_cast<QDialogButtonBox::ButtonRole>(role), doLayout); #if QT_CONFIG(shortcut) - button->setShortcut(QGuiApplicationPrivate::platformTheme()->standardButtonShortcut(sbutton)); + const QKeySequence standardShortcut = QGuiApplicationPrivate::platformTheme()->standardButtonShortcut(sbutton); + if (!standardShortcut.isEmpty()) + button->setShortcut(standardShortcut); #endif return button; } |