diff options
Diffstat (limited to 'src/corelib/kernel')
-rw-r--r-- | src/corelib/kernel/qcoreapplication.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index b3aa8f5a51..43f641244b 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -73,6 +73,7 @@ #include <private/qlocale_p.h> #include <private/qlocking_p.h> #include <private/qhooks_p.h> +#include <private/qtextcodec_p.h> #ifndef QT_NO_QOBJECT #if defined(Q_OS_UNIX) @@ -594,7 +595,7 @@ void QCoreApplicationPrivate::initLocale() return; qt_locale_initialized = true; -#ifdef Q_OS_ANDROID +#ifdef QT_LOCALE_IS_UTF8 // Android's Bionic didn't get nl_langinfo until NDK 15 (Android 8.0), // which is too new for Qt, so we just assume it's always UTF-8. auto nl_langinfo = [](int) { return "UTF-8"; }; |