diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-02-23 07:49:33 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2019-02-23 10:19:34 +0000 |
| commit | 19a9768f1a62366f1bee16a7cb9b3256ef851efe (patch) | |
| tree | 9d41df69dd52b5f49ae008c9eaf1aca9f53e1e55 /src/gui/kernel/qshortcutmap.cpp | |
| parent | bdf1c4f671c706832cea84269e91995e85eb9f07 (diff) | |
| parent | 2a1292b9168d40e71c9e67a41d3b8c499b8e222b (diff) | |
Merge "Merge remote-tracking branch 'origin/5.13' into dev" into refs/staging/dev
Diffstat (limited to 'src/gui/kernel/qshortcutmap.cpp')
| -rw-r--r-- | src/gui/kernel/qshortcutmap.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/kernel/qshortcutmap.cpp b/src/gui/kernel/qshortcutmap.cpp index 3bb42c1c0b..0395c1db38 100644 --- a/src/gui/kernel/qshortcutmap.cpp +++ b/src/gui/kernel/qshortcutmap.cpp @@ -175,7 +175,7 @@ int QShortcutMap::addShortcut(QObject *owner, const QKeySequence &key, Qt::Short /*! \internal Removes a shortcut from the global map. - If \a owner is 0, all entries in the map with the key sequence specified + If \a owner is \nullptr, all entries in the map with the key sequence specified is removed. If \a key is null, all sequences for \a owner is removed from the map. If \a id is 0, any identical \a key sequences owned by \a owner are removed. @@ -222,7 +222,7 @@ int QShortcutMap::removeShortcut(int id, QObject *owner, const QKeySequence &key /*! \internal Changes the enable state of a shortcut to \a enable. - If \a owner is 0, all entries in the map with the key sequence specified + If \a owner is \nullptr, all entries in the map with the key sequence specified is removed. If \a key is null, all sequences for \a owner is removed from the map. If \a id is 0, any identical \a key sequences owned by \a owner are changed. @@ -260,7 +260,7 @@ int QShortcutMap::setShortcutEnabled(bool enable, int id, QObject *owner, const /*! \internal Changes the auto repeat state of a shortcut to \a enable. - If \a owner is 0, all entries in the map with the key sequence specified + If \a owner is \nullptr, all entries in the map with the key sequence specified is removed. If \a key is null, all sequences for \a owner is removed from the map. If \a id is 0, any identical \a key sequences owned by \a owner are changed. |