summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRitt Konstantin <ritt.ks@gmail.com>2010-11-29 17:22:37 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-11-29 17:24:00 (GMT)
commitac8535b0277670e2a8f572045306e957ffa4dfc1 (patch)
treee1cf42a2e165b2e42e5e5a25eb1f966d588993c1 /src
parent1a204f01b5f2dd2cfea81d371f476f8eb1d895ee (diff)
downloadQt-ac8535b0277670e2a8f572045306e957ffa4dfc1.zip
Qt-ac8535b0277670e2a8f572045306e957ffa4dfc1.tar.gz
Qt-ac8535b0277670e2a8f572045306e957ffa4dfc1.tar.bz2
add QChar::currentUnicodeVersion() static member
Merge-request: 2482 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
Diffstat (limited to 'src')
-rw-r--r--src/corelib/tools/qchar.cpp9
-rw-r--r--src/corelib/tools/qchar.h2
2 files changed, 11 insertions, 0 deletions
diff --git a/src/corelib/tools/qchar.cpp b/src/corelib/tools/qchar.cpp
index fba0bd2..a99b313 100644
--- a/src/corelib/tools/qchar.cpp
+++ b/src/corelib/tools/qchar.cpp
@@ -1069,6 +1069,15 @@ QChar::UnicodeVersion QChar::unicodeVersion(ushort ucs2)
return (QChar::UnicodeVersion) qGetProp(ucs2)->unicodeVersion;
}
+/*!
+ \since 4.8
+
+ Returns the most recent supported Unicode version.
+*/
+QChar::UnicodeVersion QChar::currentUnicodeVersion()
+{
+ return UNICODE_DATA_VERSION;
+}
/*!
Returns the lowercase equivalent if the character is uppercase or titlecase;
diff --git a/src/corelib/tools/qchar.h b/src/corelib/tools/qchar.h
index b9e7e01..ecc6603 100644
--- a/src/corelib/tools/qchar.h
+++ b/src/corelib/tools/qchar.h
@@ -334,6 +334,8 @@ public:
static UnicodeVersion QT_FASTCALL unicodeVersion(uint ucs4);
static UnicodeVersion QT_FASTCALL unicodeVersion(ushort ucs2);
+ static UnicodeVersion QT_FASTCALL currentUnicodeVersion();
+
static QString QT_FASTCALL decomposition(uint ucs4);
#ifdef QT3_SUPPORT