diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-04 01:00:59 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-02-04 10:44:00 +0100 |
| commit | 97417e8f2896bfbe1d9e9a703ddba980983d1442 (patch) | |
| tree | ecee79f9b126bc695904e74000c0775d1ef34646 /util | |
| parent | 02eb9df851093f11872c828869226903c81f1b60 (diff) | |
| parent | 056230cc9c3309823a93df0e34c92affb29df9e4 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
.qmake.conf
examples/widgets/widgets/imageviewer/imageviewer.cpp
src/corelib/text/qchar.cpp
src/corelib/time/qdatetime.cpp
Change-Id: I9762f5c4ff650799219729d6aee79ac07ce9024a
Diffstat (limited to 'util')
| -rw-r--r-- | util/glgen/codegenerator.cpp | 2 | ||||
| -rwxr-xr-x | util/locale_database/cldr2qlocalexml.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/util/glgen/codegenerator.cpp b/util/glgen/codegenerator.cpp index 08327a62f5..79e889a13e 100644 --- a/util/glgen/codegenerator.cpp +++ b/util/glgen/codegenerator.cpp @@ -184,7 +184,7 @@ void CodeGenerator::writeCoreFactoryImplementation(const QString &fileName) cons // Get the set of version functions classes we need to create QList<Version> versions = m_parser->versions(); - std::sort(m_versions.begin(), m_versions.end(), std::greater<Version>()); + std::sort(versions.begin(), versions.end(), std::greater<Version>()); // Outout the #include statements stream << QStringLiteral("#if !defined(QT_OPENGL_ES_2)") << endl; diff --git a/util/locale_database/cldr2qlocalexml.py b/util/locale_database/cldr2qlocalexml.py index 072ea9e4ed..a1df872e01 100755 --- a/util/locale_database/cldr2qlocalexml.py +++ b/util/locale_database/cldr2qlocalexml.py @@ -305,6 +305,7 @@ def _generateLocaleInfo(path, language_code, script_code, country_code, variant_ result['decimal'] = get_number_in_system(path, "numbers/symbols/decimal", numbering_system) result['group'] = get_number_in_system(path, "numbers/symbols/group", numbering_system) + assert result['decimal'] != result['group'] result['list'] = get_number_in_system(path, "numbers/symbols/list", numbering_system) result['percent'] = get_number_in_system(path, "numbers/symbols/percentSign", numbering_system) try: |