diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2016-12-19 11:49:36 +0100 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2016-12-19 11:49:51 +0100 |
| commit | 25277124d8b7581a9390702ad3d4bcd4be8dedd7 (patch) | |
| tree | 92ea6d78df705f9c01747905a760dc8dd308d51d /src/quick/util | |
| parent | 6812d1921161612788ac2f7c49decce77c8e0ccd (diff) | |
| parent | c4eefa4a8d6d3e95062deb78229940460a7ef605 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/scenegraphng
Change-Id: Id7c17b390a8360b4324afa040774dba8e8fc891f
Diffstat (limited to 'src/quick/util')
| -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 a0a58f2e02..72d9c889e3 100644 --- a/src/quick/util/qquickshortcut.cpp +++ b/src/quick/util/qquickshortcut.cpp @@ -73,7 +73,7 @@ It is also possible to set multiple shortcut \l sequences, so that the shortcut can be \l activated via several different sequences of key presses. - \sa Keys + \sa Keys, {Keys::}{shortcutOverride()} */ /*! \qmlsignal QtQuick::Shortcut::activated() |