summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-12-04 17:01:26 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-12-08 13:20:59 +0100
commit3215168f0dc1dee1064d9063b2748e64cc2577bc (patch)
treea2e46978e5aadc80636b5e6a7b58050677f90485 /tests
parent6401cc1f1fd50421ccb2ce90fdd84e3c519f3f72 (diff)
Fix building against 5.12 on most CIs
Change-Id: I4c4bbc75b9f6346a446f8094f669d142f76c164a Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp5
-rw-r--r--tests/auto/quick/quick.pro2
-rw-r--r--tests/auto/widgets/accessibility/tst_accessibility.cpp3
-rw-r--r--tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp4
4 files changed, 14 insertions, 0 deletions
diff --git a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
index 5ee30f165..e879d9262 100644
--- a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
+++ b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
@@ -993,6 +993,7 @@ void tst_QQuickWebEngineView::inputEventForwardingDisabledWhenActiveFocusOnPress
void tst_QQuickWebEngineView::changeLocale()
{
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
QStringList errorLines;
QUrl url("http://non.existent/");
@@ -1028,6 +1029,7 @@ void tst_QQuickWebEngineView::changeLocale()
QTRY_VERIFY(!evaluateJavaScriptSync(viewDE.data(), "document.body.innerText").isNull());
errorLines = evaluateJavaScriptSync(viewDE.data(), "document.body.innerText").toString().split(QRegularExpression("[\r\n]"), Qt::SkipEmptyParts);
QCOMPARE(errorLines.first().toUtf8(), QByteArrayLiteral("Die Website ist nicht erreichbar"));
+#endif
}
void tst_QQuickWebEngineView::userScripts()
@@ -1173,6 +1175,9 @@ void tst_QQuickWebEngineView::focusChild_data()
void tst_QQuickWebEngineView::focusChild()
{
+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 1)
+ QSKIP("Requires newer base Qt");
+#endif
auto traverseToWebDocumentAccessibleInterface = [](QAccessibleInterface *iface) -> QAccessibleInterface * {
QFETCH(QVector<QAccessible::Role>, ancestorRoles);
for (int i = 0; i < ancestorRoles.size(); ++i) {
diff --git a/tests/auto/quick/quick.pro b/tests/auto/quick/quick.pro
index 41ea5c4c1..f02652ba1 100644
--- a/tests/auto/quick/quick.pro
+++ b/tests/auto/quick/quick.pro
@@ -20,5 +20,7 @@ qtConfig(webengine-testsupport) {
qtConfig(ssl): SUBDIRS += qmltests_ssl
+lessThan(QT_MAJOR_VERSION, 6):lessThan(QT_MINOR_VERSION, 14): SUBDIRS -= qmltests qmltests2 qmltests_ssl
+
# QTBUG-66055
boot2qt: SUBDIRS -= inspectorserver qquickwebengineview qmltests qmltests2
diff --git a/tests/auto/widgets/accessibility/tst_accessibility.cpp b/tests/auto/widgets/accessibility/tst_accessibility.cpp
index 84382d6f1..0c235382a 100644
--- a/tests/auto/widgets/accessibility/tst_accessibility.cpp
+++ b/tests/auto/widgets/accessibility/tst_accessibility.cpp
@@ -160,6 +160,9 @@ void tst_Accessibility::focusChild_data()
void tst_Accessibility::focusChild()
{
+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 1)
+ QSKIP("Requires newer base Qt");
+#endif
auto traverseToWebDocumentAccessibleInterface = [](QAccessibleInterface *iface) -> QAccessibleInterface * {
QFETCH(QVector<QAccessible::Role>, ancestorRoles);
for (int i = 0; i < ancestorRoles.size(); ++i) {
diff --git a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
index 2257a6f4e..afc0750cd 100644
--- a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
+++ b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
@@ -1160,6 +1160,7 @@ void tst_QWebEngineView::doNotBreakLayout()
void tst_QWebEngineView::changeLocale()
{
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
QStringList errorLines;
QUrl url("http://non.existent/");
@@ -1195,6 +1196,7 @@ void tst_QWebEngineView::changeLocale()
QTRY_VERIFY(!toPlainTextSync(viewDE.page()).isEmpty());
errorLines = toPlainTextSync(viewDE.page()).split(QRegularExpression("[\r\n]"), Qt::SkipEmptyParts);
QCOMPARE(errorLines.first().toUtf8(), QByteArrayLiteral("Die Website ist nicht erreichbar"));
+#endif
}
void tst_QWebEngineView::inputMethodsTextFormat_data()
@@ -1480,6 +1482,7 @@ void tst_QWebEngineView::mouseClick()
void tst_QWebEngineView::postData()
{
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
QMap<QString, QString> postData;
// use reserved characters to make the test harder to pass
postData[QStringLiteral("Spä=m")] = QStringLiteral("ëgg:s");
@@ -1607,6 +1610,7 @@ void tst_QWebEngineView::postData()
timeoutGuard.stop();
server.close();
+#endif
}
void tst_QWebEngineView::inputFieldOverridesShortcuts()