diff options
4 files changed, 16 insertions, 0 deletions
diff --git a/tests/auto/quick/qquickwebengineview/CMakeLists.txt b/tests/auto/quick/qquickwebengineview/CMakeLists.txt index 45c44034a..90cbb7a3d 100644 --- a/tests/auto/quick/qquickwebengineview/CMakeLists.txt +++ b/tests/auto/quick/qquickwebengineview/CMakeLists.txt @@ -9,5 +9,6 @@ qt_internal_add_test(tst_qquickwebengineview Qt::WebEngineQuick Qt::GuiPrivate Qt::WebEngineQuickPrivate + Qt::TestPrivate Test::Util ) diff --git a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp index 63dbf0452..5f141aadc 100644 --- a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp +++ b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp @@ -44,6 +44,7 @@ #include <QtWebEngineQuick/private/qquickwebenginesettings_p.h> #include <QtWebEngineCore/private/qtwebenginecore-config_p.h> #include <qpa/qplatforminputcontext.h> +#include <QtTest/private/qemulationdetector_p.h> #include <functional> @@ -369,6 +370,9 @@ QImage tryToGrabWindowUntil(QQuickWindow *window, std::function<bool(const QImag void tst_QQuickWebEngineView::basicRenderingSanity() { + if (QTestPrivate::isRunningArmOnX86()) + QSKIP("Grab does not work with QEMU."); + showWebEngineView(); webEngineView()->setUrl(QUrl(QString::fromUtf8("data:text/html,<html><body bgcolor=\"%2300ff00\"></body></html>"))); @@ -408,6 +412,9 @@ void tst_QQuickWebEngineView::titleUpdate() void tst_QQuickWebEngineView::transparentWebEngineViews() { + if (QTestPrivate::isRunningArmOnX86()) + QSKIP("Grab does not work with QEMU."); + showWebEngineView(); // This should not crash. @@ -996,6 +1003,9 @@ void tst_QQuickWebEngineView::inputEventForwardingDisabledWhenActiveFocusOnPress void tst_QQuickWebEngineView::changeLocale() { + if (QTestPrivate::isRunningArmOnX86()) + QSKIP("Does not work with QEMU. (QTBUG-94911)"); + QStringList errorLines; QUrl url("http://non.existent/"); diff --git a/tests/auto/widgets/qwebengineview/CMakeLists.txt b/tests/auto/widgets/qwebengineview/CMakeLists.txt index ac803df41..b06ee7201 100644 --- a/tests/auto/widgets/qwebengineview/CMakeLists.txt +++ b/tests/auto/widgets/qwebengineview/CMakeLists.txt @@ -8,6 +8,7 @@ qt_internal_add_test(tst_qwebengineview Qt::WebEngineCorePrivate Qt::GuiPrivate Qt::QuickWidgets + Qt::TestPrivate Test::Util ) diff --git a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp index dc0efcfb6..9f9bd7f91 100644 --- a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp +++ b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp @@ -47,6 +47,7 @@ #include <QStyle> #include <QWebEngineProfile> #include <QtCore/qregularexpression.h> +#include <QtTest/private/qemulationdetector_p.h> #define VERIFY_INPUTMETHOD_HINTS(actual, expect) \ QVERIFY(actual == (expect | Qt::ImhNoPredictiveText | Qt::ImhNoTextHandles | Qt::ImhNoEditMenu)); @@ -1170,6 +1171,9 @@ void tst_QWebEngineView::doNotBreakLayout() void tst_QWebEngineView::changeLocale() { + if (QTestPrivate::isRunningArmOnX86()) + QSKIP("Does not work with QEMU. (QTBUG-94911)"); + QStringList errorLines; QUrl url("http://non.existent/"); |