diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2017-04-20 19:53:44 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2017-04-20 18:10:59 +0000 |
| commit | 5311eb0d8e0ddaad62f37c1191462ad2ae0e5c2d (patch) | |
| tree | 57214d068feb4996f72b7924212222cb809b8ce5 /tests/auto/corelib/tools/qstringview/tst_qstringview.cpp | |
| parent | dc8bfab82eb051a516a4138e50f2d8de5095319e (diff) | |
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>
Diffstat (limited to 'tests/auto/corelib/tools/qstringview/tst_qstringview.cpp')
| -rw-r--r-- | tests/auto/corelib/tools/qstringview/tst_qstringview.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/corelib/tools/qstringview/tst_qstringview.cpp b/tests/auto/corelib/tools/qstringview/tst_qstringview.cpp index 1ca56406d4..9849bd78da 100644 --- a/tests/auto/corelib/tools/qstringview/tst_qstringview.cpp +++ b/tests/auto/corelib/tools/qstringview/tst_qstringview.cpp @@ -87,7 +87,7 @@ Q_STATIC_ASSERT(CanConvert<const ushort*>::value); // char16_t // -#if !defined(Q_OS_WIN) || defined(Q_COMPILER_UNICODE_STRINGS) +#if defined(Q_COMPILER_UNICODE_STRINGS) Q_STATIC_ASSERT(!CanConvert<char16_t>::value); @@ -96,7 +96,7 @@ Q_STATIC_ASSERT(CanConvert<const char16_t*>::value); #endif -#ifdef Q_COMPILER_UNICODE_STRINGS +#if defined(Q_STDLIB_UNICODE_STRINGS) Q_STATIC_ASSERT(CanConvert< std::u16string >::value); Q_STATIC_ASSERT(CanConvert<const std::u16string >::value); @@ -155,7 +155,7 @@ private Q_SLOTS: void fromChar16TStar() const { -#if !defined(Q_OS_WIN) || defined(Q_COMPILER_UNICODE_STRINGS) +#if defined(Q_COMPILER_UNICODE_STRINGS) fromLiteral(u"Hello, World!"); #else QSKIP("This test requires C++11 char16_t support enabled in the compiler"); @@ -182,7 +182,7 @@ private Q_SLOTS: } void fromStdStringChar16T() const { -#ifdef Q_COMPILER_UNICODE_STRINGS +#ifdef Q_STDLIB_UNICODE_STRINGS fromStdString<char16_t>(); #else QSKIP("This test requires C++11 char16_t support enabled in compiler & stdlib"); |