From 5311eb0d8e0ddaad62f37c1191462ad2ae0e5c2d Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@kdab.com>
Date: Thu, 20 Apr 2017 19:53:44 +0200
Subject: Use new Q_STDLIB_UNICODE_STRINGS and Q_COMPILER_UNICODE_STRINGS

... instead of the combination with Q_OS_WIN we used so far.

This patch adapts ocurrences that are new in 5.10.

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

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

diff --git a/src/corelib/tools/qstringview.h b/src/corelib/tools/qstringview.h
index 64d3aa2266..169a30ba69 100644
--- a/src/corelib/tools/qstringview.h
+++ b/src/corelib/tools/qstringview.h
@@ -61,7 +61,7 @@ struct IsCompatibleCharTypeHelper
     : std::integral_constant<bool,
                              std::is_same<Char, QChar>::value ||
                              std::is_same<Char, ushort>::value ||
-#if !defined(Q_OS_WIN) || defined(Q_COMPILER_UNICODE_STRINGS)
+#if defined(Q_COMPILER_UNICODE_STRINGS)
                              std::is_same<Char, char16_t>::value ||
 #endif
                              (std::is_same<Char, wchar_t>::value && sizeof(wchar_t) == sizeof(QChar))> {};
-- 
cgit v1.2.3