Rework country setting to match how we return the script setting

Change-Id: I753673ef79b4ad208fa6e0c6a4eb8139cd2ee253 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-04-20 12:04:31 +02:00 · 2020-04-20 12:04:31 +02:00 · 06d431e37f
parent 4c3ec0caa8
commit 06d431e37f
1 changed files with 1 additions and 3 deletions
--- 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();