diff options
| author | BogDan Vatra <bogdan@kdab.com> | 2017-08-17 09:32:44 +0300 |
|---|---|---|
| committer | BogDan Vatra <bogdan@kdab.com> | 2017-08-18 04:47:32 +0000 |
| commit | 0027d73b0283d01bbe718df8865ce8b0ca794780 (patch) | |
| tree | 5cd20b7f2acfe867f941c259a451f639456514bb /src/corelib | |
| parent | b525ec2eb0bb441ac0dcd0a055efcad08fe6957c (diff) | |
Android: Dissable internal hack when using libc++
libc++ has proper wstring support
Change-Id: Ifae98676974bfd660b7f849d4466efc5486d3fca
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/tools/qstring.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qstring.h b/src/corelib/tools/qstring.h index 88ba4a3fb5..8f957a7b22 100644 --- a/src/corelib/tools/qstring.h +++ b/src/corelib/tools/qstring.h @@ -53,7 +53,7 @@ #include <string> #include <iterator> -#if defined(Q_OS_ANDROID) +#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 |