diff options
author | Liang Qi <liang.qi@qt.io> | 2016-08-18 09:47:06 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-08-18 09:47:21 +0200 |
commit | 5df9fb29e13800932e00800059ba431a95de160b (patch) | |
tree | 096a61564b0f5ee4a62549f2685cbe6a9b2261bf /src/quick/util/qquickshortcut.cpp | |
parent | b03c85de2ab337858b44bf0a21692d7b544313a5 (diff) | |
parent | 4840bc0c207aa09b4332842c67e65bc92f43d3bd (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I20c622263f40c322954328e4d10a8071db3ca6d1
Diffstat (limited to 'src/quick/util/qquickshortcut.cpp')
-rw-r--r-- | src/quick/util/qquickshortcut.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/util/qquickshortcut.cpp b/src/quick/util/qquickshortcut.cpp index 66c29474cc..9725ddd671 100644 --- a/src/quick/util/qquickshortcut.cpp +++ b/src/quick/util/qquickshortcut.cpp @@ -144,7 +144,7 @@ void QQuickShortcut::setSequence(const QVariant &sequence) \since 5.6 This property provides the shortcut's key sequence as a platform specific - string. This means that it will be shown translated, and on OS X it will + string. This means that it will be shown translated, and on \macos it will resemble a key sequence from the menu bar. It is best to display this text to the user (for example, on a tooltip). |