summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorKonstantin Ritt <ritt.ks@gmail.com>2012-06-03 04:17:10 +0300
committerQt by Nokia <qt-info@nokia.com>2012-06-10 15:57:49 +0200
commit60e1892d836c40955b9939cf74d79e6c0b997c9f (patch)
tree7f4f6f0f0f63f5ba11c6aa1251661ad6e9def562 /src/corelib
parent2176a4f04fb5fa100d0c013d7d8d0eb5269e1b8f (diff)
Update the qunicodetables generator to deal with UCD 6.1 files
Change-Id: If22018ff83cfc6b9c984f689648da038fce11d84 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/tools/qchar.cpp6
-rw-r--r--src/corelib/tools/qchar.h6
2 files changed, 10 insertions, 2 deletions
diff --git a/src/corelib/tools/qchar.cpp b/src/corelib/tools/qchar.cpp
index f7744ee3f1..7461c46d21 100644
--- a/src/corelib/tools/qchar.cpp
+++ b/src/corelib/tools/qchar.cpp
@@ -176,8 +176,12 @@ QT_BEGIN_NAMESPACE
\value Unicode_4_0 Version 4.0
\value Unicode_4_1 Version 4.1
\value Unicode_5_0 Version 5.0
+ \value Unicode_5_1 Version 5.1
+ \value Unicode_5_2 Version 5.2
+ \value Unicode_6_0 Version 6.0
+ \value Unicode_6_1 Version 6.1
\value Unicode_Unassigned The value is not assigned to any character
- in version 5.0 of Unicode.
+ in version 6.1 of Unicode.
\sa unicodeVersion(), currentUnicodeVersion()
*/
diff --git a/src/corelib/tools/qchar.h b/src/corelib/tools/qchar.h
index c8cbd1d0cf..97edf12cc9 100644
--- a/src/corelib/tools/qchar.h
+++ b/src/corelib/tools/qchar.h
@@ -204,7 +204,11 @@ public:
Unicode_3_2,
Unicode_4_0,
Unicode_4_1,
- Unicode_5_0
+ Unicode_5_0,
+ Unicode_5_1,
+ Unicode_5_2,
+ Unicode_6_0,
+ Unicode_6_1
};
// ****** WHEN ADDING FUNCTIONS, CONSIDER ADDING TO QCharRef TOO