diff --git a/src/corelib/text/qlocale_win.cpp b/src/corelib/text/qlocale_win.cpp index 89779bcd2f..e238b67d03 100644 --- a/src/corelib/text/qlocale_win.cpp +++ b/src/corelib/text/qlocale_win.cpp @@ -14,10 +14,9 @@ #include -#ifdef Q_OS_WIN -# include -# include -#endif +// TODO QTBUG-121193: port away from the use of LCID to always use names. +#include +#include #if QT_CONFIG(cpp_winrt) # include @@ -67,8 +66,6 @@ static auto getDefaultWinId() } static QByteArray getWinLocaleName(LCID id = LOCALE_USER_DEFAULT); -static QString winIso639LangName(LCID id = LOCALE_USER_DEFAULT); -static QString winIso3116CtryName(LCID id = LOCALE_USER_DEFAULT); #ifndef QT_NO_SYSTEMLOCALE @@ -1174,6 +1171,7 @@ static QByteArray getWinLocaleName(LCID id) return std::move(resultusage).toLatin1(); } +// Helper for plugins/platforms/windows/ Q_CORE_EXPORT QLocale qt_localeFromLCID(LCID id) { return QLocale(QString::fromLatin1(getWinLocaleName(id)));