summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2020-11-11 12:42:24 +0100
committerEdward Welbourne <edward.welbourne@qt.io>2020-11-17 19:55:04 +0100
commit1721b80e1051076a12c06c778a8537e9f7493bf0 (patch)
tree919eebdb557c39fb57ccfa021b49ba33d72363d8 /src
parent63f03f5e2da2714407933f9bafe7fc675a8e7a89 (diff)
Export QLocaleId::fromName() so qttools can use it
This shall replace QLocalePrivate::getLangAndCountry()'s use by qttools. Change-Id: Ib686a3769bd38c477d7fbad50cf494ee8a0b1c00 Reviewed-by: Andrei Golubev <andrei.golubev@qt.io> Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/corelib/text/qlocale_p.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/text/qlocale_p.h b/src/corelib/text/qlocale_p.h
index d435e1666a..eda8bd0ca4 100644
--- a/src/corelib/text/qlocale_p.h
+++ b/src/corelib/text/qlocale_p.h
@@ -148,7 +148,8 @@ namespace QIcu {
struct QLocaleId
{
- static QLocaleId fromName(const QString &name);
+ // ### Also used by Translator::languageAndCountry() in qttools:
+ Q_CORE_EXPORT static QLocaleId fromName(const QString &name);
inline bool operator==(QLocaleId other) const
{ return language_id == other.language_id && script_id == other.script_id && country_id == other.country_id; }
inline bool operator!=(QLocaleId other) const