diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-25 19:53:30 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-25 19:53:30 (GMT) |
| commit | ef5891755bf760b68df1fc387e08a1b16980d6ad (patch) | |
| tree | ffacc13c82dcadd1dda588e703ba43e440d9454c /util | |
| parent | 5a7223450d0ebd4eaa47f263005c6d1c2e142a76 (diff) | |
| parent | a32c96e753c2f5a123e518a92762ec9c9ff3b0b7 (diff) | |
| download | Qt-ef5891755bf760b68df1fc387e08a1b16980d6ad.zip Qt-ef5891755bf760b68df1fc387e08a1b16980d6ad.tar.gz Qt-ef5891755bf760b68df1fc387e08a1b16980d6ad.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (50 commits)
Dont crash when assigning the same input context twice.
Fixed a typo in variable name in qlocale data generator.
Fix for Norwegian and Korean languages on symbian.
Remove unused function in QDBusConnectionPrivate
Doc: Fixing bugs in HTML generator
Updating 4.7.0 change log.
Doc: Correcting style to class lists
qdoc: Improved class index page.
Added MSVC 2010 project files to .gitignore
Fix architecture detection on GNU/Hurd.
Revert "tst_bic: make it possible to test for cross-compilation"
fix typo in documentation
Improve Bearer Management related documentation in QNetworkAccessManager
Compile with QT_NO_ACTION.
Unbreak compilation outside Mac
QDBusAbstractInterface: don't set lastError outside the object's own thread
tst_bic: make it possible to test for cross-compilation
Remove Q_PACKED from QChar and QLocale::Data.
QDebug operator for QFlags
Removing unneeded qDebug statement.
...
Diffstat (limited to 'util')
| -rwxr-xr-x | util/local_database/cldr2qlocalexml.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util/local_database/cldr2qlocalexml.py b/util/local_database/cldr2qlocalexml.py index 20a7d34..1d9ccda 100755 --- a/util/local_database/cldr2qlocalexml.py +++ b/util/local_database/cldr2qlocalexml.py @@ -123,7 +123,7 @@ def generateLocaleInfo(path): result['language_id'] = language_id result['country_id'] = country_id - numberingSystem = None + numbering_system = None try: numbering_system = findEntry(path, "numbers/defaultNumberingSystem") except: |