diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-16 18:41:27 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-16 18:41:27 +0100 |
| commit | ff922e7b87de147797fbd759167878aec7625f0c (patch) | |
| tree | a326819f23e2421723f144522f9362ba608d6bb1 /util/locale_database | |
| parent | e464e1eb8eb63c631fb0916c3ea4540a88d8aad3 (diff) | |
| parent | 75f52bd0ddc4afbd181c14b310d256e3507052d6 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/corelib/kernel/qmetatype.cpp
Change-Id: I88eb0d3e9c9a38abf7241a51e370c655ae74e38a
Diffstat (limited to 'util/locale_database')
| -rw-r--r-- | util/locale_database/qlocalexml.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/util/locale_database/qlocalexml.py b/util/locale_database/qlocalexml.py index b4fbe86be5..0a4628e05e 100644 --- a/util/locale_database/qlocalexml.py +++ b/util/locale_database/qlocalexml.py @@ -179,8 +179,6 @@ class Locale: 'weekendStart', 'weekendEnd', 'longDateFormat', 'shortDateFormat', 'longTimeFormat', 'shortTimeFormat', - 'longDays', 'shortDays', 'narrowDays', - 'standaloneLongDays', 'standaloneShortDays', 'standaloneNarrowDays', 'currencyIsoCode', 'currencySymbol', 'currencyDisplayName', 'currencyFormat', 'currencyNegativeFormat' ) + tuple(self.propsMonthDay('days')) + tuple( |