From 3caa5f3e2a2ea8bc830acb3662f67339d4dc1ead Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Wed, 2 Jun 2021 13:45:56 +0200
Subject: Add 'testsupport' to cmake builds

This enables running more tests.
Fix issues with tst_qquickwebengineviewgraphics.

Change-Id: Ib223b4e723a7192c18202e8d5dd65d83872f3336
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit 4e92dc14b86655154f70e8a1093cc9f3aae1604f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 tests/auto/quick/CMakeLists.txt                               |  4 ++--
 tests/auto/quick/qmltests/CMakeLists.txt                      |  2 +-
 tests/auto/quick/qquickwebengineviewgraphics/CMakeLists.txt   | 11 +++++++++++
 .../tst_qquickwebengineviewgraphics.cpp                       | 10 +++++-----
 4 files changed, 19 insertions(+), 8 deletions(-)
 create mode 100644 tests/auto/quick/qquickwebengineviewgraphics/CMakeLists.txt

(limited to 'tests')

diff --git a/tests/auto/quick/CMakeLists.txt b/tests/auto/quick/CMakeLists.txt
index 6fd767049..3ad3b37c8 100644
--- a/tests/auto/quick/CMakeLists.txt
+++ b/tests/auto/quick/CMakeLists.txt
@@ -7,6 +7,6 @@ if(NOT boot2qt)
     add_subdirectory(qmltests)
     add_subdirectory(qquickwebengineview)
 endif()
-if(QT_FEATURE_webengine_testsupport)
-#    add_subdirectory(qquickwebengineviewgraphics)
+if(QT_FEATURE_webenginequick_testsupport)
+    add_subdirectory(qquickwebengineviewgraphics)
 endif()
diff --git a/tests/auto/quick/qmltests/CMakeLists.txt b/tests/auto/quick/qmltests/CMakeLists.txt
index 487d07dc8..56ba60ebb 100644
--- a/tests/auto/quick/qmltests/CMakeLists.txt
+++ b/tests/auto/quick/qmltests/CMakeLists.txt
@@ -55,7 +55,7 @@ if(QT_FEATURE_ssl)
     list(APPEND testList tst_certificateError.qml)
 endif()
 
-if(QT_FEATURE_webengine_testsupport)
+if(QT_FEATURE_webenginequick_testsupport)
     list(APPEND testList
         tst_inputMethod.qml
         tst_javaScriptDialogs.qml
diff --git a/tests/auto/quick/qquickwebengineviewgraphics/CMakeLists.txt b/tests/auto/quick/qquickwebengineviewgraphics/CMakeLists.txt
new file mode 100644
index 000000000..c7e6bc925
--- /dev/null
+++ b/tests/auto/quick/qquickwebengineviewgraphics/CMakeLists.txt
@@ -0,0 +1,11 @@
+include(../../util/util.cmake)
+qt_internal_add_test(tst_qquickwebengineviewgraphics
+    SOURCES
+        tst_qquickwebengineviewgraphics.cpp
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::WebEngineWidgets
+        Qt::WebEngineQuickPrivate
+        Qt::Test
+        Test::Util
+)
diff --git a/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp b/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp
index d04a88510..855b01653 100644
--- a/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp
+++ b/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp
@@ -26,15 +26,14 @@
 **
 ****************************************************************************/
 
-#include "util.h"
-
+#include <quickutil.h>
 #include <QtTest/QtTest>
 #include <QQmlContext>
 #include <QQuickView>
 #include <QQuickItem>
 #include <QPainter>
 #include <QtWebEngineQuick/qtwebenginequickglobal.h>
-#include <private/qquickwebengineview_p.h>
+#include <QtWebEngineQuick/private/qquickwebengineview_p.h>
 
 #include <map>
 
@@ -153,10 +152,11 @@ void tst_QQuickWebEngineViewGraphics::setHtml(const QString &html)
     m_view->create();
 
     QQuickWebEngineView *webEngineView = static_cast<QQuickWebEngineView *>(m_view->rootObject());
-    webEngineView->setProperty("url", QUrl(QStringLiteral("data:text/html,%1").arg(htmlData)));
-    QTRY_COMPARE_WITH_TIMEOUT(m_view->rootObject()->property("loading"), QVariant(false), 30000);
+    webEngineView->setUrl(QUrl(QStringLiteral("data:text/html,%1").arg(htmlData)));
+    QVERIFY(waitForLoadSucceeded(webEngineView));
 }
 
 static QByteArrayList params;
 W_QTEST_MAIN(tst_QQuickWebEngineViewGraphics, params)
 #include "tst_qquickwebengineviewgraphics.moc"
+#include "moc_quickutil.cpp"
-- 
cgit v1.2.3