diff options
| author | BogDan Vatra <bogdan@kde.org> | 2019-07-09 10:34:31 +0300 |
|---|---|---|
| committer | BogDan Vatra <bogdan@kde.org> | 2019-08-22 16:32:47 +0300 |
| commit | 9b14950ff600a4ce5a8698b67ab38907c50417f1 (patch) | |
| tree | ef3c8a9f4f0a42b622a9070a1ef65bdb02b529a7 /src/corelib/text/qstring.h | |
| parent | a4d19654edec88b5ca0a2516c1b2038ad309ca6d (diff) | |
Android: Update clang mkspecs
Follow Google's BuildSystemMaintainers doc to simplify (a lot) the clang support
It is needed to support future NDK releases painlessly.
Also remove old workarounds.
[ChangeLog][Android] Android depends on NDK r20+
Change-Id: Ib4c07fc71e0f5a264d804b0b3baa18ff79d07630
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'src/corelib/text/qstring.h')
| -rw-r--r-- | src/corelib/text/qstring.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/corelib/text/qstring.h b/src/corelib/text/qstring.h index 88286b902a..7b1351666d 100644 --- a/src/corelib/text/qstring.h +++ b/src/corelib/text/qstring.h @@ -57,15 +57,6 @@ #include <string> #include <iterator> -#if defined(Q_OS_ANDROID) && !defined(ANDROID_HAS_WSTRING) -// std::wstring is disabled on android's glibc, as bionic lacks certain features -// that libstdc++ checks for (like mbcslen). -namespace std -{ - typedef basic_string<wchar_t> wstring; -} -#endif - #include <stdarg.h> #ifdef truncate |