1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

shortcuteditor example: Don't reference null-action

Browse Source 
The parent nodes of the leaf ShortcutEditorModelItem nodes
do not have an action item.

Pick-to: 6.5
Change-Id: If9f8554101974a96f95db048b1bd691f3e89a23a
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Tor Arne Vestbø 2023-05-16 12:59:43 +02:00
parent bc4e9e432a
commit fda4da6df9
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
examples/widgets/widgets/shortcuteditor/shortcuteditormodel.cpp
View File

@ -257,11 +257,11 @@ bool ShortcutEditorModel::setData(const QModelIndex &index, const QVariant &valu
QString keySequenceString = value.toString(); QString keySequenceString = value.toString();
ShortcutEditorModelItem *item = static_cast<ShortcutEditorModelItem *>(index.internalPointer()); ShortcutEditorModelItem *item = static_cast<ShortcutEditorModelItem *>(index.internalPointer());
QAction *itemAction = item->action(); QAction *itemAction = item->action();
if (itemAction if (itemAction) {
&& keySequenceString == itemAction->shortcut().toString(QKeySequence::NativeText)) if (keySequenceString == itemAction->shortcut().toString(QKeySequence::NativeText))
return true; return true;
itemAction->setShortcut(keySequenceString);
itemAction->setShortcut(keySequenceString); }
Q_EMIT dataChanged(index, index); Q_EMIT dataChanged(index, index);
if (keySequenceString.isEmpty()) if (keySequenceString.isEmpty())