diff options
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qnamespace.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index 9056eab2f1..fa3d5913b5 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -241,8 +241,11 @@ public: TextForceRightToLeft = 0x40000, // Ensures that the longest variant is always used when computing the // size of a multi-variant string. - TextLongestVariant = 0x80000, - TextBypassShaping = 0x100000 + TextLongestVariant = 0x80000 + +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + , TextBypassShaping = 0x100000 +#endif }; enum TextElideMode { |