From 1721b80e1051076a12c06c778a8537e9f7493bf0 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Wed, 11 Nov 2020 12:42:24 +0100 Subject: Export QLocaleId::fromName() so qttools can use it MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This shall replace QLocalePrivate::getLangAndCountry()'s use by qttools. Change-Id: Ib686a3769bd38c477d7fbad50cf494ee8a0b1c00 Reviewed-by: Andrei Golubev Reviewed-by: Mårten Nordheim --- src/corelib/text/qlocale_p.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') 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 -- cgit v1.2.3