summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2020-10-09 12:26:19 +0200
committerEdward Welbourne <edward.welbourne@qt.io>2020-10-12 16:53:40 +0200
commit8b0e068847c03c58f510f89c85dcc7a5e4ac7ef4 (patch)
tree7c6f3023b5526e56d3f7e06f5d3b13d4a1fcea28 /util
parent71ad83529e7d2c7828e027666f24470cf86db63e (diff)
Mark QLocale's Language, Country and Script enums as ushort
The code pervasively presumes their values can be held in a ushort, so make sure the compiler knows we expect that to work (and doesn't complain about narrowing when we do convert them to ushort). Change-Id: Idde7be6cceee8a6dae333c5b1d5a0120fec32e4a Reviewed-by: Andrei Golubev <andrei.golubev@qt.io> Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'util')
-rwxr-xr-xutil/locale_database/qlocalexml2cpp.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/util/locale_database/qlocalexml2cpp.py b/util/locale_database/qlocalexml2cpp.py
index 4235f1feb3..bf4d580236 100755
--- a/util/locale_database/qlocalexml2cpp.py
+++ b/util/locale_database/qlocalexml2cpp.py
@@ -468,7 +468,7 @@ class LocaleHeaderWriter (SourceFileEditor):
def __enum(self, name, book, alias):
assert book
out, dupes = self.writer.write, self.__dupes
- out(' enum {} {{\n'.format(name))
+ out(' enum {} : ushort {{\n'.format(name))
for key, value in book.items():
member = value[0]
if name == 'Script':