diff --git a/tests/auto/quick/qquickwebengineview/BLACKLIST b/tests/auto/quick/qquickwebengineview/BLACKLIST index 6cfd71635f54bd0f41640f93fb52ba4992ff3619..2cde594548304c054ce8bb154b6c61190bb65425 100644 --- a/tests/auto/quick/qquickwebengineview/BLACKLIST +++ b/tests/auto/quick/qquickwebengineview/BLACKLIST @@ -3,6 +3,3 @@ windows [inputEventForwardingDisabledWhenActiveFocusOnPressDisabled] * - -[changeLocale] -windows diff --git a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp index a6818c6ef2202a72112b96ad5edf41a7dc663b2e..2f9063ea5b5aa50dff02e601192a68582593da18 100644 --- a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp +++ b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp @@ -695,7 +695,7 @@ void tst_QQuickWebEngineView::changeLocale() QTRY_VERIFY(!bodyInnerText(viewDE.data()).isEmpty()); errorLines = bodyInnerText(viewDE.data()).split(QRegExp("[\r\n]"), QString::SkipEmptyParts); - QCOMPARE(errorLines.first(), QStringLiteral("Diese Website ist nicht erreichbar")); + QCOMPARE(errorLines.first().toUtf8(), QByteArrayLiteral("Diese Website ist nicht erreichbar")); QLocale::setDefault(QLocale("en")); QScopedPointer<QQuickWebEngineView> viewEN(newWebEngineView()); @@ -704,7 +704,7 @@ void tst_QQuickWebEngineView::changeLocale() QTRY_VERIFY(!bodyInnerText(viewEN.data()).isEmpty()); errorLines = bodyInnerText(viewEN.data()).split(QRegExp("[\r\n]"), QString::SkipEmptyParts); - QCOMPARE(errorLines.first(), QStringLiteral("This site can\u2019t be reached")); + QCOMPARE(errorLines.first().toUtf8(), QByteArrayLiteral("This site can\xE2\x80\x99t be reached")); // Reset error page viewDE->setUrl(QUrl("about:blank")); @@ -716,7 +716,7 @@ void tst_QQuickWebEngineView::changeLocale() QTRY_VERIFY(!bodyInnerText(viewDE.data()).isEmpty()); errorLines = bodyInnerText(viewDE.data()).split(QRegExp("[\r\n]"), QString::SkipEmptyParts); - QCOMPARE(errorLines.first(), QStringLiteral("Diese Website ist nicht erreichbar")); + QCOMPARE(errorLines.first().toUtf8(), QByteArrayLiteral("Diese Website ist nicht erreichbar")); } void tst_QQuickWebEngineView::userScripts() diff --git a/tests/auto/widgets/qwebengineview/BLACKLIST b/tests/auto/widgets/qwebengineview/BLACKLIST index d249ac141c00ef982d44217e751179a13deebdec..0a909d0f6c5068fc79c200e045d870e9f2d650c5 100644 --- a/tests/auto/widgets/qwebengineview/BLACKLIST +++ b/tests/auto/widgets/qwebengineview/BLACKLIST @@ -1,5 +1,2 @@ [doNotSendMouseKeyboardEventsWhenDisabled] windows -[changeLocale] -windows -linux diff --git a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp index e511714373f68afe241d184ac58f356c7f7d5d79..42dd23a9c8c0ec05219390cdc7fbf4259e80942a 100644 --- a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp +++ b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp @@ -926,7 +926,7 @@ void tst_QWebEngineView::changeLocale() QTRY_VERIFY(!toPlainTextSync(viewDE.page()).isEmpty()); errorLines = toPlainTextSync(viewDE.page()).split(QRegExp("[\r\n]"), QString::SkipEmptyParts); - QCOMPARE(errorLines.first(), QStringLiteral("Diese Website ist nicht erreichbar")); + QCOMPARE(errorLines.first().toUtf8(), QByteArrayLiteral("Diese Website ist nicht erreichbar")); QLocale::setDefault(QLocale("en")); QWebEngineView viewEN; @@ -936,7 +936,7 @@ void tst_QWebEngineView::changeLocale() QTRY_VERIFY(!toPlainTextSync(viewEN.page()).isEmpty()); errorLines = toPlainTextSync(viewEN.page()).split(QRegExp("[\r\n]"), QString::SkipEmptyParts); - QCOMPARE(errorLines.first(), QStringLiteral("This site can\u2019t be reached")); + QCOMPARE(errorLines.first().toUtf8(), QByteArrayLiteral("This site can\xE2\x80\x99t be reached")); // Reset error page viewDE.load(QUrl("about:blank")); @@ -949,7 +949,7 @@ void tst_QWebEngineView::changeLocale() QTRY_VERIFY(!toPlainTextSync(viewDE.page()).isEmpty()); errorLines = toPlainTextSync(viewDE.page()).split(QRegExp("[\r\n]"), QString::SkipEmptyParts); - QCOMPARE(errorLines.first(), QStringLiteral("Diese Website ist nicht erreichbar")); + QCOMPARE(errorLines.first().toUtf8(), QByteArrayLiteral("Diese Website ist nicht erreichbar")); } void tst_QWebEngineView::inputMethodsTextFormat_data()