diff options
author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2020-06-29 13:18:51 +0200 |
---|---|---|
committer | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2020-07-09 18:38:14 +0200 |
commit | c023b025ee7f3e221b1ad947722ec4d4fa5f5e5e (patch) | |
tree | a224f06a84b43dde974d91f5f5d0a8365cf123c0 /src/corelib/global/qnamespace.h | |
parent | 89ecbf0978a0e6aeb1eecdeda98339d67c08eb6e (diff) |
Qt::Modifier: do some cleanups
Qt::UNICODE_ACCEL had no effect since at least Qt 4.0. We can drop
it in Qt 6. The whole Qt::Modifier enumeration is still widely
used, so we can't drop it yet, but we should aim at doing so in
Qt 7. Add a note.
[ChangeLog][QtCore][Qt::Modifier] The Qt::UNICODE_ACCEL enumerator
has been removed. It had no effect since Qt 4.0.
[ChangeLog][QtCore][Qt::Modifier] Usage of the enumerators in
the Qt::Modifier enumeration is discouraged. The enumeration
will likely get removed in the next major version of Qt.
Change-Id: If25f30d920878d32903b91a38044f5da042c7eab
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/corelib/global/qnamespace.h')
-rw-r--r-- | src/corelib/global/qnamespace.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index cb1c08e4fa..3e2020ebd5 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -96,13 +96,13 @@ namespace Qt { // user-defined or third-party macros. More so when the identifiers are not // "namespace"-prefixed. This is considered bad practice and is why // KeypadModifier was not added to the Modifier enum. + // ### Qt 7: consider deprecating in favor of KeyboardModifier. enum Modifier { META = Qt::MetaModifier, SHIFT = Qt::ShiftModifier, CTRL = Qt::ControlModifier, ALT = Qt::AltModifier, MODIFIER_MASK = KeyboardModifierMask, - UNICODE_ACCEL = 0x00000000 }; enum MouseButton { |