summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qchar.h
diff options
context:
space:
mode:
authorOlivier Goffart <olivier.goffart@nokia.com>2011-07-14 16:21:21 +0200
committerQt by Nokia <qt-info@nokia.com>2011-07-15 09:49:52 +0200
commit639943ddea8836f75052f13c4569867fb0a0be58 (patch)
tree45e20855a4054f602ce0020963836b99b34d2e91 /src/corelib/tools/qchar.h
parent4bb5167177abca3133ce5a93e6e3e0da84a8f0af (diff)
Revert "make QChar::Unicode_Unassigned a constantly big value"
This reverts commit ebfd24a20b1acdced5fe032eedb2737efdc6eb92. Breaks QChar and QString autotests Change-Id: If1e915520ea491262c5f7753368be98c02ddac5e Reviewed-by: Ritt Konstantin Reviewed-on: http://codereview.qt.nokia.com/1672 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
Diffstat (limited to 'src/corelib/tools/qchar.h')
-rw-r--r--src/corelib/tools/qchar.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/tools/qchar.h b/src/corelib/tools/qchar.h
index 9047b6a9da..af50f6dde7 100644
--- a/src/corelib/tools/qchar.h
+++ b/src/corelib/tools/qchar.h
@@ -190,6 +190,7 @@ public:
};
enum UnicodeVersion {
+ Unicode_Unassigned, // ### Qt 5: assign with some constantly big value
Unicode_1_1,
Unicode_2_0,
Unicode_2_1_2,
@@ -198,8 +199,7 @@ public:
Unicode_3_2,
Unicode_4_0,
Unicode_4_1,
- Unicode_5_0,
- Unicode_Unassigned = 0xff
+ Unicode_5_0
};
// ****** WHEN ADDING FUNCTIONS, CONSIDER ADDING TO QCharRef TOO