diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-05-20 08:22:14 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-05-20 08:22:14 (GMT) |
| commit | d92b8e0fdcbfcad0c98b8c51fe2bd6451868af62 (patch) | |
| tree | 462bf65a95e6de5438c728cbf157994e9684cd37 /util/local_database/qlocalexml2cpp.py | |
| parent | eff255bd29a8cbd09494f9e9480c2e4b07869386 (diff) | |
| parent | a948c797e0c45c965ada005b34c274514a3c4d42 (diff) | |
| download | Qt-d92b8e0fdcbfcad0c98b8c51fe2bd6451868af62.zip Qt-d92b8e0fdcbfcad0c98b8c51fe2bd6451868af62.tar.gz Qt-d92b8e0fdcbfcad0c98b8c51fe2bd6451868af62.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Conflicts:
examples/declarative/toys/dynamicscene/qml/itemCreation.js
Diffstat (limited to 'util/local_database/qlocalexml2cpp.py')
| -rwxr-xr-x | util/local_database/qlocalexml2cpp.py | 5 |
1 files changed, 4 insertions, 1 deletions
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 ";" |