diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-13 21:26:34 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-13 21:26:34 +0100 |
| commit | beaeeb99881184fd368c121fcbb1a31c78b794a3 (patch) | |
| tree | 0e078499d8fe3e8627e3612537e61f2dd1029625 /Tools/TestWebKitAPI/Tests/WTF/StringOperators.cpp | |
| parent | f7697030f444b5e16331c6d0a99712736b9ff026 (diff) | |
| parent | 79143ccfc158ec4fffc49eee600d600edb342b16 (diff) | |
| download | qtwebkit-beaeeb99881184fd368c121fcbb1a31c78b794a3.tar.gz | |
Merge remote-tracking branch 'origin/5.212' into dev
Change-Id: I9e64176fe95183acf5e093aa081b0a498795bdb2
Diffstat (limited to 'Tools/TestWebKitAPI/Tests/WTF/StringOperators.cpp')
| -rw-r--r-- | Tools/TestWebKitAPI/Tests/WTF/StringOperators.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Tools/TestWebKitAPI/Tests/WTF/StringOperators.cpp b/Tools/TestWebKitAPI/Tests/WTF/StringOperators.cpp index 7a1d9297f..fd8836fd1 100644 --- a/Tools/TestWebKitAPI/Tests/WTF/StringOperators.cpp +++ b/Tools/TestWebKitAPI/Tests/WTF/StringOperators.cpp @@ -148,7 +148,8 @@ TEST(WTF, StringOperators) EXPECT_N_WTF_STRING_COPIES(2, atomicString + (literal + string + literal)); EXPECT_N_WTF_STRING_COPIES(2, (atomicString + literal) + (string + literal)); -#if COMPILER(MSVC) +// FIXME: Fix compatibility with ICU >= 58.1 +#if COMPILER(MSVC) && !PLATFORM(QT) EXPECT_N_WTF_STRING_COPIES(1, L"wide string" + string); EXPECT_N_WTF_STRING_COPIES(1, string + L"wide string"); EXPECT_N_WTF_STRING_COPIES(1, L"wide string" + atomicString); |