summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRitt Konstantin <ritt.ks@gmail.com>2010-02-24 19:13:18 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-03-05 15:58:06 (GMT)
commit43c4852de3c990c0f84bedfec3da168cb259e19d (patch)
treebf6a7d7c07f195e22d8ded28ee9b0b9f791c3154
parent59068d0d90ed28a1a99a5fdef3d4aaadddb31d6d (diff)
downloadQt-43c4852de3c990c0f84bedfec3da168cb259e19d.zip
Qt-43c4852de3c990c0f84bedfec3da168cb259e19d.tar.gz
Qt-43c4852de3c990c0f84bedfec3da168cb259e19d.tar.bz2
apply some (forgotten) changes to generator as they were applied to the data
b6542eb2 - Thierry Bastian) fix to exported symbol 2e429e40 - Lars Knoll) N'Ko support Merge-request: 480 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
-rw-r--r--util/unicode/main.cpp12
1 files changed, 9 insertions, 3 deletions
diff --git a/util/unicode/main.cpp b/util/unicode/main.cpp
index 8f27d4a..4d20b22 100644
--- a/util/unicode/main.cpp
+++ b/util/unicode/main.cpp
@@ -38,9 +38,11 @@
** $QT_END_LICENSE$
**
****************************************************************************/
+
#include <qlist.h>
#include <qhash.h>
#include <qfile.h>
+#include <qbytearray.h>
#include <qstring.h>
#include <qchar.h>
#include <private/qunicodetables_p.h>
@@ -275,7 +277,7 @@ const char *methods =
" }\n"
"\n"
" Q_CORE_EXPORT int QT_FASTCALL script(uint ucs4);\n"
- " Q_CORE_EXPORT_INLINE int QT_FASTCALL script(const QChar &ch) {\n"
+ " inline int script(const QChar &ch) {\n"
" return script(ch.unicode());\n"
" }\n\n";
@@ -1644,6 +1646,7 @@ QByteArray createScriptEnumDeclaration()
"Lao",
"Malayalam",
"Myanmar",
+ "Nko",
"Ogham",
"Oriya",
"Runic",
@@ -1683,9 +1686,12 @@ QByteArray createScriptEnumDeclaration()
scriptHash[i] = i;
}
- declaration += ",\n ";
- declaration += scriptName;
+ if (scriptName != "Inherited") {
+ declaration += ",\n ";
+ declaration += scriptName;
+ }
}
+ declaration += ",\n Inherited";
declaration += ",\n ScriptCount = Inherited";
// output the ones that are an alias for 'Common'