Merge remote branch 'origin/4.7' into qt-master-from-4.7

3 files changed, 14 insertions, 2 deletions

diff --git a/util/local_database/cldr2qlocalexml.py b/util/local_database/cldr2qlocalexml.py
index fa9ab47..20a7d34 100755
--- a/util/local_database/cldr2qlocalexml.py
+++ b/util/local_database/cldr2qlocalexml.py
@@ -459,6 +459,14 @@ print \
             <language>Persian</language>\n\
             <country>Iran</country>\n\
         </defaultCountry>\n\
+        <defaultCountry>\n\
+            <language>Mongolian</language>\n\
+            <country>Mongolia</country>\n\
+        </defaultCountry>\n\
+        <defaultCountry>\n\
+            <language>Nepali</language>\n\
+            <country>Nepal</country>\n\
+        </defaultCountry>\n\
     </defaultCountryList>"
 
 print "    <localeList>"
diff --git a/util/local_database/enumdata.py b/util/local_database/enumdata.py
index b742272..f6b145d 100644
--- a/util/local_database/enumdata.py
+++ b/util/local_database/enumdata.py
@@ -507,7 +507,8 @@ country_list = {
     242 : [ "Montenegro",                               "ME"  ],
     243 : [ "Serbia",                                   "RS"  ],
     244 : [ "Saint Barthelemy",                         "BL"  ],
-    245 : [ "Saint Martin",                             "MF"  ]
+    245 : [ "Saint Martin",                             "MF"  ],
+    246 : [ "LatinAmericaAndTheCaribbean",              "419" ]
 }
 
 def countryCodeToId(code):
diff --git a/util/local_database/qlocalexml2cpp.py b/util/local_database/qlocalexml2cpp.py
index da2da32..b6523af 100755
--- a/util/local_database/qlocalexml2cpp.py
+++ b/util/local_database/qlocalexml2cpp.py
@@ -549,7 +549,10 @@ def main():
     # Country code list
     print "static const unsigned char country_code_list[] ="
     for key in country_map.keys():
-        print "\"%2s\" // %s" % (country_map[key][1], country_map[key][0])
+        code = country_map[key][1]
+        if len(code) == 2:
+            code += "\\0"
+        print "\"%2s\" // %s" % (code, country_map[key][0])
     print ";"