summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJüri Valdmann <juri.valdmann@qt.io>2018-08-21 13:50:05 +0200
committerJüri Valdmann <juri.valdmann@qt.io>2018-08-22 15:01:14 +0000
commit04ccb412fcbde165fc84f698fb806df69f3ede5e (patch)
treee2438225bab2c88d06b80be76a4fb9175117d35e
parent4bff5a66084a07c78603c8255126aafcff61177c (diff)
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 <allan.jensen@qt.io>
-rw-r--r--tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp42
1 files changed, 21 insertions, 21 deletions
diff --git a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
index fad71a517..b9a8b6a09 100644
--- a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
+++ b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
@@ -2338,9 +2338,9 @@ void tst_QWebEngineView::imeJSInputEvents()
// Simply committing text should not trigger any JS composition event.
QTRY_COMPARE(logLines().count(), 3);
- QCOMPARE(logLines()[0], "[object InputEvent] beforeinput commit");
- QCOMPARE(logLines()[1], "[object TextEvent] textInput commit");
- QCOMPARE(logLines()[2], "[object InputEvent] input commit");
+ QCOMPARE(logLines()[0], QStringLiteral("[object InputEvent] beforeinput commit"));
+ QCOMPARE(logLines()[1], QStringLiteral("[object TextEvent] textInput commit"));
+ QCOMPARE(logLines()[2], QStringLiteral("[object InputEvent] input commit"));
evaluateJavaScriptSync(view.page(), "clear()");
QTRY_VERIFY(evaluateJavaScriptSync(view.page(), "log.textContent + input.textContent").toString().isEmpty());
@@ -2354,10 +2354,10 @@ void tst_QWebEngineView::imeJSInputEvents()
}
QTRY_COMPARE(logLines().count(), 4);
- QCOMPARE(logLines()[0], "[object CompositionEvent] compositionstart ");
- QCOMPARE(logLines()[1], "[object InputEvent] beforeinput preedit");
- QCOMPARE(logLines()[2], "[object CompositionEvent] compositionupdate preedit");
- QCOMPARE(logLines()[3], "[object InputEvent] input preedit");
+ QCOMPARE(logLines()[0], QStringLiteral("[object CompositionEvent] compositionstart "));
+ QCOMPARE(logLines()[1], QStringLiteral("[object InputEvent] beforeinput preedit"));
+ QCOMPARE(logLines()[2], QStringLiteral("[object CompositionEvent] compositionupdate preedit"));
+ QCOMPARE(logLines()[3], QStringLiteral("[object InputEvent] input preedit"));
{
QList<QInputMethodEvent::Attribute> attributes;
@@ -2368,11 +2368,11 @@ void tst_QWebEngineView::imeJSInputEvents()
}
QTRY_COMPARE(logLines().count(), 9);
- QCOMPARE(logLines()[4], "[object InputEvent] beforeinput commit");
- QCOMPARE(logLines()[5], "[object CompositionEvent] compositionupdate commit");
- QCOMPARE(logLines()[6], "[object TextEvent] textInput commit");
- QCOMPARE(logLines()[7], "[object InputEvent] input commit");
- QCOMPARE(logLines()[8], "[object CompositionEvent] compositionend commit");
+ QCOMPARE(logLines()[4], QStringLiteral("[object InputEvent] beforeinput commit"));
+ QCOMPARE(logLines()[5], QStringLiteral("[object CompositionEvent] compositionupdate commit"));
+ QCOMPARE(logLines()[6], QStringLiteral("[object TextEvent] textInput commit"));
+ QCOMPARE(logLines()[7], QStringLiteral("[object InputEvent] input commit"));
+ QCOMPARE(logLines()[8], QStringLiteral("[object CompositionEvent] compositionend commit"));
evaluateJavaScriptSync(view.page(), "clear()");
QTRY_VERIFY(evaluateJavaScriptSync(view.page(), "log.textContent + input.textContent").toString().isEmpty());
@@ -2386,10 +2386,10 @@ void tst_QWebEngineView::imeJSInputEvents()
}
QTRY_COMPARE(logLines().count(), 4);
- QCOMPARE(logLines()[0], "[object CompositionEvent] compositionstart ");
- QCOMPARE(logLines()[1], "[object InputEvent] beforeinput preedit");
- QCOMPARE(logLines()[2], "[object CompositionEvent] compositionupdate preedit");
- QCOMPARE(logLines()[3], "[object InputEvent] input preedit");
+ QCOMPARE(logLines()[0], QStringLiteral("[object CompositionEvent] compositionstart "));
+ QCOMPARE(logLines()[1], QStringLiteral("[object InputEvent] beforeinput preedit"));
+ QCOMPARE(logLines()[2], QStringLiteral("[object CompositionEvent] compositionupdate preedit"));
+ QCOMPARE(logLines()[3], QStringLiteral("[object InputEvent] input preedit"));
{
QList<QInputMethodEvent::Attribute> attributes;
@@ -2399,11 +2399,11 @@ void tst_QWebEngineView::imeJSInputEvents()
}
QTRY_COMPARE(logLines().count(), 9);
- QCOMPARE(logLines()[4], "[object InputEvent] beforeinput ");
- QCOMPARE(logLines()[5], "[object CompositionEvent] compositionupdate ");
- QCOMPARE(logLines()[6], "[object TextEvent] textInput ");
- QCOMPARE(logLines()[7], "[object InputEvent] input null");
- QCOMPARE(logLines()[8], "[object CompositionEvent] compositionend ");
+ QCOMPARE(logLines()[4], QStringLiteral("[object InputEvent] beforeinput "));
+ QCOMPARE(logLines()[5], QStringLiteral("[object CompositionEvent] compositionupdate "));
+ QCOMPARE(logLines()[6], QStringLiteral("[object TextEvent] textInput "));
+ QCOMPARE(logLines()[7], QStringLiteral("[object InputEvent] input null"));
+ QCOMPARE(logLines()[8], QStringLiteral("[object CompositionEvent] compositionend "));
evaluateJavaScriptSync(view.page(), "clear()");
QTRY_VERIFY(evaluateJavaScriptSync(view.page(), "log.textContent + input.textContent").toString().isEmpty());