diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-06-10 22:40:02 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-06-10 22:40:02 (GMT) |
| commit | d911206aed44fa3839132d2bf62b2ba21bd93a72 (patch) | |
| tree | 025e7c3498fe770ea557dd2fdc9d905bb9f0d5bb /src/corelib/tools/qlocale_data_p.h | |
| parent | df4763878d756fe1f5bcfe6b7dd8cf91cdd091e1 (diff) | |
| parent | 9ba808cf3fa6118822b7fc9ed9f8f2d0ce2218c3 (diff) | |
| download | Qt-d911206aed44fa3839132d2bf62b2ba21bd93a72.zip Qt-d911206aed44fa3839132d2bf62b2ba21bd93a72.tar.gz Qt-d911206aed44fa3839132d2bf62b2ba21bd93a72.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/corelib/tools/qlocale_data_p.h')
| -rw-r--r-- | src/corelib/tools/qlocale_data_p.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/tools/qlocale_data_p.h b/src/corelib/tools/qlocale_data_p.h index 37f59a4..e0eecf3 100644 --- a/src/corelib/tools/qlocale_data_p.h +++ b/src/corelib/tools/qlocale_data_p.h @@ -60,8 +60,8 @@ QT_BEGIN_NAMESPACE */ struct CountryLanguage { - quint32 languageId; - quint32 countryId; + quint16 languageId; + quint16 countryId; }; static const CountryLanguage ImperialMeasurementSystems[] = { { 31, 225 }, @@ -83,7 +83,7 @@ static const int ImperialMeasurementSystemsCount = */ -static const uint locale_index[] = { +static const quint16 locale_index[] = { 0, // unused 0, // C 0, // Abkhazian @@ -2313,7 +2313,7 @@ static const char language_name_list[] = "Chewa\0" ; -static const uint language_name_index[] = { +static const quint16 language_name_index[] = { 0, // Unused 8, // C 10, // Abkhazian @@ -2727,7 +2727,7 @@ static const char country_name_list[] = "SerbiaAndMontenegro\0" ; -static const uint country_name_index[] = { +static const quint16 country_name_index[] = { 0, // AnyCountry 8, // Afghanistan 20, // Albania |