path: root/util
diff options
authorJohn Layt <>2012-03-26 17:23:21 +0100
committerQt by Nokia <>2012-04-24 16:37:11 +0200
commit0060b44d7045434583f14b5787211bafd045dd54 (patch)
tree7a515509cb1c904ada365e2e1aef4c6038f96e56 /util
parentfeb736ef27deb5afc4b8739b3f831b1a94004163 (diff)
QLocale: Clean up QLocalePrivate implementation
In Qt4 QLocalePrivate is a struct returned by a d() method. This will be unsuitable for the planned change to use ICU and may cause BIC issues. This change makes QLocalePrivate a class and creates a new struct QLocaleData to hold the data index. Further clean-ups are possible but are left for later. Change-Id: Ie316a07790f74674a3b520b735dff72695cc4060 Reviewed-by: Lars Knoll <> Reviewed-by: Jason McDonald <> Reviewed-by: Thiago Macieira <>
Diffstat (limited to 'util')
1 files changed, 1 insertions, 1 deletions
diff --git a/util/local_database/ b/util/local_database/
index 3cb2b982e5..882883dfd9 100755
--- a/util/local_database/
+++ b/util/local_database/
@@ -513,7 +513,7 @@ def main():
endonyms_data = StringData()
# Locale data
- data_temp_file.write("static const QLocalePrivate locale_data[] = {\n")
+ data_temp_file.write("static const QLocaleData locale_data[] = {\n")
data_temp_file.write("// lang script terr dec group list prcnt zero minus plus exp quotStart quotEnd altQuotStart altQuotEnd lpStart lpMid lpEnd lpTwo sDtFmt lDtFmt sTmFmt lTmFmt ssMonth slMonth sMonth lMonth sDays lDays am,len pm,len\n")
locale_keys = locale_map.keys()