display correctly keyboard shortcut in toolbar tooltip under macOS

This commit is contained in:
Salvatore Larosa 2018-01-28 09:35:22 +01:00
parent 231dae3124
commit 856dd08a10

View File

@ -38,7 +38,7 @@ void QgsShortcutsManager::registerAllChildActions( QObject *object, bool recursi
QList< QAction * > actions = object->findChildren< QAction * >(); QList< QAction * > actions = object->findChildren< QAction * >();
Q_FOREACH ( QAction *a, actions ) Q_FOREACH ( QAction *a, actions )
{ {
registerAction( a, a->shortcut().toString() ); registerAction( a, a->shortcut().toString( QKeySequence::NativeText ) );
} }
} }
else else
@ -47,7 +47,7 @@ void QgsShortcutsManager::registerAllChildActions( QObject *object, bool recursi
{ {
if ( QAction *a = qobject_cast<QAction *>( child ) ) if ( QAction *a = qobject_cast<QAction *>( child ) )
{ {
registerAction( a, a->shortcut().toString() ); registerAction( a, a->shortcut().toString( QKeySequence::NativeText ) );
} }
} }
} }
@ -60,7 +60,7 @@ void QgsShortcutsManager::registerAllChildShortcuts( QObject *object, bool recur
QList< QShortcut * > shortcuts = object->findChildren< QShortcut * >(); QList< QShortcut * > shortcuts = object->findChildren< QShortcut * >();
Q_FOREACH ( QShortcut *s, shortcuts ) Q_FOREACH ( QShortcut *s, shortcuts )
{ {
registerShortcut( s, s->key().toString() ); registerShortcut( s, s->key().toString( QKeySequence::NativeText ) );
} }
} }
else else
@ -69,7 +69,7 @@ void QgsShortcutsManager::registerAllChildShortcuts( QObject *object, bool recur
{ {
if ( QShortcut *s = qobject_cast<QShortcut *>( child ) ) if ( QShortcut *s = qobject_cast<QShortcut *>( child ) )
{ {
registerShortcut( s, s->key().toString() ); registerShortcut( s, s->key().toString( QKeySequence::NativeText ) );
} }
} }
} }