diff options
| author | Karsten Heimrich <karsten.heimrich@qt.io> | 2020-06-17 12:33:40 +0200 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@qt.io> | 2020-06-20 02:04:38 +0200 |
| commit | 18ec53156ee704fdb4977436fccfdc85333e614b (patch) | |
| tree | df734ce7893d570f4a90f923fcfe9c80ddc3de05 /src/corelib/kernel/qcoreapplication.cpp | |
| parent | 4455de24d453138411c57bae55af18f3fba58d4b (diff) | |
Move QTextCodec support out of QtCore
* Assume UTF-8 on all Unix like systems
* Export some functions to be able to compile QTextCodec once
moved to Qt5Compat.
Task-number: QTBUG-75665
Change-Id: I52ec47a848bc0ba72e9c7689668b1bcc5d736c29
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/kernel/qcoreapplication.cpp')
| -rw-r--r-- | src/corelib/kernel/qcoreapplication.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index a3414b3edc..87e5d89350 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -73,7 +73,6 @@ #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) @@ -578,11 +577,9 @@ void QCoreApplicationPrivate::initLocale() return; qt_locale_initialized = true; -#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"; }; -#endif const char *locale = setlocale(LC_ALL, ""); const char *codec = nl_langinfo(CODESET); |