diff --git a/src/corelib/text/qlocale_p.h b/src/corelib/text/qlocale_p.h index 5f2dd958634..60bc78db044 100644 --- a/src/corelib/text/qlocale_p.h +++ b/src/corelib/text/qlocale_p.h @@ -68,6 +68,7 @@ QT_BEGIN_NAMESPACE #ifndef QT_NO_SYSTEMLOCALE struct QLocaleData; +// Subclassed by Android platform plugin: class Q_CORE_EXPORT QSystemLocale { public: @@ -154,7 +155,7 @@ namespace QIcu { struct QLocaleId { - [[nodiscard]] Q_CORE_EXPORT static QLocaleId fromName(QStringView name); + [[nodiscard]] static QLocaleId fromName(QStringView name); [[nodiscard]] inline bool operator==(QLocaleId other) const { return language_id == other.language_id && script_id == other.script_id && territory_id == other.territory_id; } [[nodiscard]] inline bool operator!=(QLocaleId other) const @@ -403,7 +404,7 @@ public: quint8 m_grouping_least : 3; // Number of digits after last grouping separator (before decimal). }; -class Q_CORE_EXPORT QLocalePrivate +class QLocalePrivate { public: constexpr QLocalePrivate(const QLocaleData *data, const uint index, diff --git a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp index ae42046eac0..c5ba0033637 100644 --- a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp +++ b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp @@ -2974,7 +2974,7 @@ void tst_QLocale::textDirection_data() default: break; } - const QLatin1String testName = QLocalePrivate::languageToCode(QLocale::Language(language)); + const QString testName = QLocale::languageToCode(QLocale::Language(language)); QTest::newRow(qPrintable(testName)) << language << int(QLocale::AnyScript) << rightToLeft; } QTest::newRow("pa_Arab") << int(QLocale::Punjabi) << int(QLocale::ArabicScript) << true;