1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MinGW: Fix compile error in qlocale_win.cpp

Browse Source 
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>
This commit is contained in:
Friedemann Kleint 2020-11-09 16:05:19 +01:00
parent aefd414ce2
commit ae7c3985f1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/text/qlocale_win.cpp
View File

@ -518,7 +518,7 @@ QVariant QSystemLocalePrivate::currencySymbol(QLocale::CurrencySymbolFormat form
QVariant QSystemLocalePrivate::toCurrencyString(const QSystemLocale::CurrencyToStringArgument &arg) QVariant QSystemLocalePrivate::toCurrencyString(const QSystemLocale::CurrencyToStringArgument &arg)
{ {
QString value; QString value;
switch (arg.value.type()) { switch (arg.value.typeId()) {
case QMetaType::Int: case QMetaType::Int:
value = QLocaleData::c()->longLongToString( value = QLocaleData::c()->longLongToString(
arg.value.toInt(), -1, 10, -1, QLocale::OmitGroupSeparator); arg.value.toInt(), -1, 10, -1, QLocale::OmitGroupSeparator);
@ -762,8 +762,8 @@ QVariant QSystemLocale::query(QueryType type, QVariant in) const
if (type == LanguageId) if (type == LanguageId)
return lid.language_id; return lid.language_id;
if (type == ScriptId) if (type == ScriptId)
return lid.script_id ? lid.script_id : fallbackUiLocale().script(); return lid.script_id ? lid.script_id : ushort(fallbackUiLocale().script());
return lid.country_id ? lid.country_id : fallbackUiLocale().country(); return lid.country_id ? lid.country_id : ushort(fallbackUiLocale().country());
} }
case MeasurementSystem: case MeasurementSystem:
return d->measurementSystem(); return d->measurementSystem();