diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2020-06-03 11:25:03 +0200 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2020-06-08 15:04:19 +0200 |
| commit | 078c3b7d686c3dfb584f5df57b5ed5c4cb624592 (patch) | |
| tree | 2777bfb727a790405f36204f09b35dc913fb2e58 /src/corelib/global/qnamespace.h | |
| parent | 18e8519dcdf36b211b39c131c0d6e08b5921a03c (diff) | |
Remove deprecated text-related enums
Fixes: QTBUG-82367
Change-Id: Iff2645759657f8e350754e90e791dbd583017671
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/global/qnamespace.h')
| -rw-r--r-- | src/corelib/global/qnamespace.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index b367df0f11..9ac9d7ab34 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -235,10 +235,6 @@ namespace Qt { // Ensures that the longest variant is always used when computing the // size of a multi-variant string. TextLongestVariant = 0x80000 - -#if QT_DEPRECATED_SINCE(5, 11) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - , TextBypassShaping = 0x100000 -#endif }; enum TextElideMode { |