diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2020-05-25 16:35:01 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2020-06-04 20:11:19 +0300 |
| commit | 5781ef2013160ba3810ad7df399aa79be085cd6c (patch) | |
| tree | 21e856573492b0ee3a4ee8737d587d318dfffbf7 /src | |
| parent | 8a0c16ce9fe8b1945ffbba8f60d775ecc2b9c85a (diff) | |
QNX: assume QNX is always UTF-8
Override locale encoding to UTF-8 on supported platforms.
QNX has nl_langinfo, but the header is not using extern "C". Tests
show that it returns UTF-8 regardless of the locale, so let's assume
it's always UTF-8.
Change-Id: I0fe98f8441287df9f99c334e537a7b962df105f6
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
| -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"; }; |