diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-11-09 16:05:19 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-11-10 17:08:19 +0100 |
| commit | ae7c3985f1fe9a6f73bb5cf7591ef38823804f91 (patch) | |
| tree | aa71ab285b6875439be68d48b8c8f9fa6fad68bd /src | |
| parent | aefd414ce2418bee5d6dacf9092f7a3949f02af8 (diff) | |
MinGW: Fix compile error in qlocale_win.cpp
Cast enumerations to ushort, fixing:
src/corelib/text/qlocale_win.cpp: In member function 'virtual QVariant QSystemLocale::query(QSystemLocale::QueryType, QVariant) const':
src/corelib/text/qlocale_win.cpp:765:34: error: enumeral and non-enumeral type in conditional expression [-Werror=extra]
As a drive-by, fix deprecation warning about QVariant::type().
Amends 098f43fdd2d46e15c87073aae44c5f2bd0cd8c98.
Change-Id: I2adc9833c6d6d9e9d2500f0b92b25cb5d38b583b
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/text/qlocale_win.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/text/qlocale_win.cpp b/src/corelib/text/qlocale_win.cpp index aaf9a5996e..cb0ef52c6f 100644 --- a/src/corelib/text/qlocale_win.cpp +++ b/src/corelib/text/qlocale_win.cpp @@ -518,7 +518,7 @@ QVariant QSystemLocalePrivate::currencySymbol(QLocale::CurrencySymbolFormat form QVariant QSystemLocalePrivate::toCurrencyString(const QSystemLocale::CurrencyToStringArgument &arg) { QString value; - switch (arg.value.type()) { + switch (arg.value.typeId()) { case QMetaType::Int: value = QLocaleData::c()->longLongToString( arg.value.toInt(), -1, 10, -1, QLocale::OmitGroupSeparator); @@ -762,8 +762,8 @@ QVariant QSystemLocale::query(QueryType type, QVariant in) const if (type == LanguageId) return lid.language_id; if (type == ScriptId) - return lid.script_id ? lid.script_id : fallbackUiLocale().script(); - return lid.country_id ? lid.country_id : fallbackUiLocale().country(); + return lid.script_id ? lid.script_id : ushort(fallbackUiLocale().script()); + return lid.country_id ? lid.country_id : ushort(fallbackUiLocale().country()); } case MeasurementSystem: return d->measurementSystem(); |