diff options
| author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2009-07-01 11:53:28 (GMT) |
|---|---|---|
| committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2009-07-01 11:53:53 (GMT) |
| commit | f3a6f4dc01f9d6c5c167a94ae49acff35ccc0c11 (patch) | |
| tree | 624d6ece66e0ff03a291e3cdad094d20b570a3a8 | |
| parent | 9da6a1d34f1d06879ba9d72e9ad15bf261aea8c9 (diff) | |
| download | Qt-f3a6f4dc01f9d6c5c167a94ae49acff35ccc0c11.zip Qt-f3a6f4dc01f9d6c5c167a94ae49acff35ccc0c11.tar.gz Qt-f3a6f4dc01f9d6c5c167a94ae49acff35ccc0c11.tar.bz2 | |
Fixed the build on Windows after regenerating the unicode tables.
Reviewed-by: trustme
| -rw-r--r-- | src/corelib/tools/qunicodetables.cpp | 4 | ||||
| -rw-r--r-- | util/unicode/main.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/tools/qunicodetables.cpp b/src/corelib/tools/qunicodetables.cpp index 0387181..c103016 100644 --- a/src/corelib/tools/qunicodetables.cpp +++ b/src/corelib/tools/qunicodetables.cpp @@ -4336,13 +4336,13 @@ static inline const QUnicodeTables::Properties *qGetProp(ushort ucs2) return uc_properties + index; } -Q_CORE_EXPORT const QUnicodeTables::Properties *QUnicodeTables::properties(uint ucs4) +Q_CORE_EXPORT const QUnicodeTables::Properties * QT_FASTCALL QUnicodeTables::properties(uint ucs4) { int index = GET_PROP_INDEX(ucs4); return uc_properties + index; } -Q_CORE_EXPORT const QUnicodeTables::Properties *QUnicodeTables::properties(ushort ucs2) +Q_CORE_EXPORT const QUnicodeTables::Properties * QT_FASTCALL QUnicodeTables::properties(ushort ucs2) { int index = GET_PROP_INDEX_UCS2(ucs2); return uc_properties + index; diff --git a/util/unicode/main.cpp b/util/unicode/main.cpp index 3c32e6d..c24486b 100644 --- a/util/unicode/main.cpp +++ b/util/unicode/main.cpp @@ -2052,13 +2052,13 @@ static QByteArray createPropertyInfo() " return uc_properties + index;\n" "}\n" "\n" - "Q_CORE_EXPORT const QUnicodeTables::Properties *QUnicodeTables::properties(uint ucs4)\n" + "Q_CORE_EXPORT const QUnicodeTables::Properties * QT_FASTCALL QUnicodeTables::properties(uint ucs4)\n" "{\n" " int index = GET_PROP_INDEX(ucs4);\n" " return uc_properties + index;\n" "}\n" "\n" - "Q_CORE_EXPORT const QUnicodeTables::Properties *QUnicodeTables::properties(ushort ucs2)\n" + "Q_CORE_EXPORT const QUnicodeTables::Properties * QT_FASTCALL QUnicodeTables::properties(ushort ucs2)\n" "{\n" " int index = GET_PROP_INDEX_UCS2(ucs2);\n" " return uc_properties + index;\n" |