diff options
| author | Mitch Curtis <mitch.curtis@digia.com> | 2014-03-31 17:45:37 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-31 17:45:37 +0200 |
| commit | bd822bedfea5126b12c32523a68c3a1ac7a8931d (patch) | |
| tree | 0fafd5ac037e3b62ad45e8808989ec89155618b4 /src/corelib/global/qnamespace.h | |
| parent | 84c10500b1730e8d947732728d190fde612fc840 (diff) | |
| parent | 3b5c0bc0780f1749fed7c07bd8b691400a0282b7 (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/global/qnamespace.h')
| -rw-r--r-- | src/corelib/global/qnamespace.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index d7ae97e911..839d352d36 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -267,6 +267,8 @@ public: TextJustificationForced = 0x10000, TextForceLeftToRight = 0x20000, TextForceRightToLeft = 0x40000, + // Ensures that the longest variant is always used when computing the + // size of a multi-variant string. TextLongestVariant = 0x80000, TextBypassShaping = 0x100000 }; |