diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-09-17 13:11:20 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-09-17 13:11:20 +0200 |
commit | d74fd9b0d9bf5ab80e6c104fec5a92a9b3b9372d (patch) | |
tree | 25056d484013efbbbb3eb1a78ad6a6449b671578 /tests | |
parent | 7de23e9fbb4c48152de5c1d26ed34cd68666aa30 (diff) | |
parent | 89afebb830f616a6e8c43dd37bf34551f243b264 (diff) |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
src/3rdparty
src/core/core_common.pri
Change-Id: I36dc3a70aa653e6c8a610c787b615034180a6127
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp | 42 | ||||
-rw-r--r-- | tests/quicktestbrowser/resources.qrc | 8 |
2 files changed, 25 insertions, 25 deletions
diff --git a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp index 1499a5f05..7bf1b5c42 100644 --- a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp +++ b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp @@ -2348,9 +2348,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()); @@ -2364,10 +2364,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; @@ -2378,11 +2378,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()); @@ -2396,10 +2396,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; @@ -2409,11 +2409,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()); diff --git a/tests/quicktestbrowser/resources.qrc b/tests/quicktestbrowser/resources.qrc index b1652852b..63ff051de 100644 --- a/tests/quicktestbrowser/resources.qrc +++ b/tests/quicktestbrowser/resources.qrc @@ -11,9 +11,9 @@ </qresource> <qresource prefix="icons"> <!-- To the risk of this breaking more often, do not duplicate the resources since this application won't be deployed --> - <file alias="go-next.png">../../examples/webengine/quicknanobrowser/icons/go-next.png</file> - <file alias="go-previous.png">../../examples/webengine/quicknanobrowser/icons/go-previous.png</file> - <file alias="process-stop.png">../../examples/webengine/quicknanobrowser/icons/process-stop.png</file> - <file alias="view-refresh.png">../../examples/webengine/quicknanobrowser/icons/view-refresh.png</file> + <file alias="go-next.png">../../examples/webengine/quicknanobrowser/icons/3rdparty/go-next.png</file> + <file alias="go-previous.png">../../examples/webengine/quicknanobrowser/icons/3rdparty/go-previous.png</file> + <file alias="process-stop.png">../../examples/webengine/quicknanobrowser/icons/3rdparty/process-stop.png</file> + <file alias="view-refresh.png">../../examples/webengine/quicknanobrowser/icons/3rdparty/view-refresh.png</file> </qresource> </RCC> |