Skip to content

Commit 04ccb41

Browse files
committed
Fix build against Qt 5.9
Somehow it's the case that QtTest 5.9 doesn't know how to QCOMPARE a QString with a normal string literal: ld: error: undefined symbol: bool QTest::qCompare<QString, char [31]>(QString const&, char const (&) [31], char const*, char const*, char const*, int) Change-Id: I13ce50689d9f1c157378b862fb1ed4a572ac7f79 Reviewed-by: Allan Sandfeld Jensen <[email protected]>
1 parent 4bff5a6 commit 04ccb41

File tree

1 file changed

+21
-21
lines changed

1 file changed

+21
-21
lines changed

tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2338,9 +2338,9 @@ void tst_QWebEngineView::imeJSInputEvents()
23382338

23392339
// Simply committing text should not trigger any JS composition event.
23402340
QTRY_COMPARE(logLines().count(), 3);
2341-
QCOMPARE(logLines()[0], "[object InputEvent] beforeinput commit");
2342-
QCOMPARE(logLines()[1], "[object TextEvent] textInput commit");
2343-
QCOMPARE(logLines()[2], "[object InputEvent] input commit");
2341+
QCOMPARE(logLines()[0], QStringLiteral("[object InputEvent] beforeinput commit"));
2342+
QCOMPARE(logLines()[1], QStringLiteral("[object TextEvent] textInput commit"));
2343+
QCOMPARE(logLines()[2], QStringLiteral("[object InputEvent] input commit"));
23442344

23452345
evaluateJavaScriptSync(view.page(), "clear()");
23462346
QTRY_VERIFY(evaluateJavaScriptSync(view.page(), "log.textContent + input.textContent").toString().isEmpty());
@@ -2354,10 +2354,10 @@ void tst_QWebEngineView::imeJSInputEvents()
23542354
}
23552355

23562356
QTRY_COMPARE(logLines().count(), 4);
2357-
QCOMPARE(logLines()[0], "[object CompositionEvent] compositionstart ");
2358-
QCOMPARE(logLines()[1], "[object InputEvent] beforeinput preedit");
2359-
QCOMPARE(logLines()[2], "[object CompositionEvent] compositionupdate preedit");
2360-
QCOMPARE(logLines()[3], "[object InputEvent] input preedit");
2357+
QCOMPARE(logLines()[0], QStringLiteral("[object CompositionEvent] compositionstart "));
2358+
QCOMPARE(logLines()[1], QStringLiteral("[object InputEvent] beforeinput preedit"));
2359+
QCOMPARE(logLines()[2], QStringLiteral("[object CompositionEvent] compositionupdate preedit"));
2360+
QCOMPARE(logLines()[3], QStringLiteral("[object InputEvent] input preedit"));
23612361

23622362
{
23632363
QList<QInputMethodEvent::Attribute> attributes;
@@ -2368,11 +2368,11 @@ void tst_QWebEngineView::imeJSInputEvents()
23682368
}
23692369

23702370
QTRY_COMPARE(logLines().count(), 9);
2371-
QCOMPARE(logLines()[4], "[object InputEvent] beforeinput commit");
2372-
QCOMPARE(logLines()[5], "[object CompositionEvent] compositionupdate commit");
2373-
QCOMPARE(logLines()[6], "[object TextEvent] textInput commit");
2374-
QCOMPARE(logLines()[7], "[object InputEvent] input commit");
2375-
QCOMPARE(logLines()[8], "[object CompositionEvent] compositionend commit");
2371+
QCOMPARE(logLines()[4], QStringLiteral("[object InputEvent] beforeinput commit"));
2372+
QCOMPARE(logLines()[5], QStringLiteral("[object CompositionEvent] compositionupdate commit"));
2373+
QCOMPARE(logLines()[6], QStringLiteral("[object TextEvent] textInput commit"));
2374+
QCOMPARE(logLines()[7], QStringLiteral("[object InputEvent] input commit"));
2375+
QCOMPARE(logLines()[8], QStringLiteral("[object CompositionEvent] compositionend commit"));
23762376

23772377
evaluateJavaScriptSync(view.page(), "clear()");
23782378
QTRY_VERIFY(evaluateJavaScriptSync(view.page(), "log.textContent + input.textContent").toString().isEmpty());
@@ -2386,10 +2386,10 @@ void tst_QWebEngineView::imeJSInputEvents()
23862386
}
23872387

23882388
QTRY_COMPARE(logLines().count(), 4);
2389-
QCOMPARE(logLines()[0], "[object CompositionEvent] compositionstart ");
2390-
QCOMPARE(logLines()[1], "[object InputEvent] beforeinput preedit");
2391-
QCOMPARE(logLines()[2], "[object CompositionEvent] compositionupdate preedit");
2392-
QCOMPARE(logLines()[3], "[object InputEvent] input preedit");
2389+
QCOMPARE(logLines()[0], QStringLiteral("[object CompositionEvent] compositionstart "));
2390+
QCOMPARE(logLines()[1], QStringLiteral("[object InputEvent] beforeinput preedit"));
2391+
QCOMPARE(logLines()[2], QStringLiteral("[object CompositionEvent] compositionupdate preedit"));
2392+
QCOMPARE(logLines()[3], QStringLiteral("[object InputEvent] input preedit"));
23932393

23942394
{
23952395
QList<QInputMethodEvent::Attribute> attributes;
@@ -2399,11 +2399,11 @@ void tst_QWebEngineView::imeJSInputEvents()
23992399
}
24002400

24012401
QTRY_COMPARE(logLines().count(), 9);
2402-
QCOMPARE(logLines()[4], "[object InputEvent] beforeinput ");
2403-
QCOMPARE(logLines()[5], "[object CompositionEvent] compositionupdate ");
2404-
QCOMPARE(logLines()[6], "[object TextEvent] textInput ");
2405-
QCOMPARE(logLines()[7], "[object InputEvent] input null");
2406-
QCOMPARE(logLines()[8], "[object CompositionEvent] compositionend ");
2402+
QCOMPARE(logLines()[4], QStringLiteral("[object InputEvent] beforeinput "));
2403+
QCOMPARE(logLines()[5], QStringLiteral("[object CompositionEvent] compositionupdate "));
2404+
QCOMPARE(logLines()[6], QStringLiteral("[object TextEvent] textInput "));
2405+
QCOMPARE(logLines()[7], QStringLiteral("[object InputEvent] input null"));
2406+
QCOMPARE(logLines()[8], QStringLiteral("[object CompositionEvent] compositionend "));
24072407

24082408
evaluateJavaScriptSync(view.page(), "clear()");
24092409
QTRY_VERIFY(evaluateJavaScriptSync(view.page(), "log.textContent + input.textContent").toString().isEmpty());

0 commit comments

Comments
 (0)