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/qchar | |
| 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/qchar')
| -rw-r--r-- | tests/auto/corelib/tools/qchar/tst_qchar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/corelib/tools/qchar/tst_qchar.cpp b/tests/auto/corelib/tools/qchar/tst_qchar.cpp index 76309d914b..cf4f6d21e2 100644 --- a/tests/auto/corelib/tools/qchar/tst_qchar.cpp +++ b/tests/auto/corelib/tools/qchar/tst_qchar.cpp @@ -79,7 +79,7 @@ QT_WARNING_DISABLE_DEPRECATED void tst_QChar::fromChar16_t() { -#if !defined(Q_OS_WIN) || defined(Q_COMPILER_UNICODE_STRINGS) +#if defined(Q_COMPILER_UNICODE_STRINGS) QChar aUmlaut = u'\u00E4'; // German small letter a-umlaut QCOMPARE(aUmlaut, QChar(0xE4)); QChar replacementCharacter = u'\uFFFD'; |