From 06d431e37f1015b91d0a6a7d9d6680f133e32c57 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Mon, 20 Apr 2020 12:04:31 +0200 Subject: Rework country setting to match how we return the script setting Change-Id: I753673ef79b4ad208fa6e0c6a4eb8139cd2ee253 Reviewed-by: Orgad Shaneh --- src/corelib/text/qlocale_win.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src') diff --git a/src/corelib/text/qlocale_win.cpp b/src/corelib/text/qlocale_win.cpp index e4f845f2b2..a6582236d5 100644 --- a/src/corelib/text/qlocale_win.cpp +++ b/src/corelib/text/qlocale_win.cpp @@ -854,9 +854,7 @@ QVariant QSystemLocale::query(QueryType type, QVariant in) const return lang; if (type == ScriptId) return script == QLocale::AnyScript ? fallbackUiLocale().script() : script; - if (cntry == QLocale::AnyCountry) - return fallbackUiLocale().country(); - return cntry; + return cntry == QLocale::AnyCountry ? fallbackUiLocale().country() : cntry; } case MeasurementSystem: return d->measurementSystem(); -- cgit v1.2.3