From 0027d73b0283d01bbe718df8865ce8b0ca794780 Mon Sep 17 00:00:00 2001
From: BogDan Vatra <bogdan@kdab.com>
Date: Thu, 17 Aug 2017 09:32:44 +0300
Subject: Android: Dissable internal hack when using libc++

libc++ has proper wstring support

Change-Id: Ifae98676974bfd660b7f849d4466efc5486d3fca
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/corelib/tools/qstring.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/corelib/tools/qstring.h')

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
-- 
cgit v1.2.3