From 856dd08a10906c792ad068a8b0ec303aede9af4f Mon Sep 17 00:00:00 2001 From: Salvatore Larosa Date: Sun, 28 Jan 2018 09:35:22 +0100 Subject: [PATCH] display correctly keyboard shortcut in toolbar tooltip under macOS --- src/gui/qgsshortcutsmanager.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/qgsshortcutsmanager.cpp b/src/gui/qgsshortcutsmanager.cpp index d2c6ae72bac..7f0f94ef7ca 100644 --- a/src/gui/qgsshortcutsmanager.cpp +++ b/src/gui/qgsshortcutsmanager.cpp @@ -38,7 +38,7 @@ void QgsShortcutsManager::registerAllChildActions( QObject *object, bool recursi QList< QAction * > actions = object->findChildren< QAction * >(); Q_FOREACH ( QAction *a, actions ) { - registerAction( a, a->shortcut().toString() ); + registerAction( a, a->shortcut().toString( QKeySequence::NativeText ) ); } } else @@ -47,7 +47,7 @@ void QgsShortcutsManager::registerAllChildActions( QObject *object, bool recursi { if ( QAction *a = qobject_cast( 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 * >(); Q_FOREACH ( QShortcut *s, shortcuts ) { - registerShortcut( s, s->key().toString() ); + registerShortcut( s, s->key().toString( QKeySequence::NativeText ) ); } } else @@ -69,7 +69,7 @@ void QgsShortcutsManager::registerAllChildShortcuts( QObject *object, bool recur { if ( QShortcut *s = qobject_cast( child ) ) { - registerShortcut( s, s->key().toString() ); + registerShortcut( s, s->key().toString( QKeySequence::NativeText ) ); } } }