diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-04-11 09:05:49 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-04-11 15:33:49 +0000 |
commit | 22a550303618202135e58f5673e7b8935d578687 (patch) | |
tree | 560918164edd7b76a2a8b6246f6dbca0ee69cf9a /tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp | |
parent | f8ed4ca51333157170f0fc94e2deff0d91cf4833 (diff) | |
parent | 7978feadee937299798372bced1680f52b4b1842 (diff) |
Merge "Merge branch '5.6' into 5.7" into refs/staging/5.7v5.7.0-beta1
Diffstat (limited to 'tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp')
-rw-r--r-- | tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp b/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp index cd1d1ac44..606f5af9c 100644 --- a/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp +++ b/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp @@ -34,6 +34,7 @@ #include <QQuickItem> #include <QPainter> #include <qtwebengineglobal.h> +#include <private/qquickwebenginetestsupport_p.h> #include <private/qquickwebengineview_p.h> class TestView : public QQuickView { @@ -78,6 +79,9 @@ private Q_SLOTS: private: void setHtml(const QString &html); QScopedPointer<TestView> m_view; +#ifdef ENABLE_QML_TESTSUPPORT_API + QScopedPointer<QQuickWebEngineTestSupport> m_testSupport; +#endif }; static const QString greenSquare("<div style=\"background-color: #00ff00; position:absolute; left:50px; top: 50px; width: 50px; height: 50px;\"></div>"); @@ -108,6 +112,9 @@ tst_QQuickWebEngineViewGraphics::~tst_QQuickWebEngineViewGraphics() void tst_QQuickWebEngineViewGraphics::initTestCase() { QtWebEngine::initialize(); +#ifdef ENABLE_QML_TESTSUPPORT_API + m_testSupport.reset(new QQuickWebEngineTestSupport); +#endif } void tst_QQuickWebEngineViewGraphics::init() @@ -183,9 +190,11 @@ void tst_QQuickWebEngineViewGraphics::setHtml(const QString &html) m_view->create(); QQuickWebEngineView *webEngineView = static_cast<QQuickWebEngineView *>(m_view->rootObject()); - QSignalSpy spy(reinterpret_cast<QObject *>(webEngineView->experimental()), SIGNAL(loadVisuallyCommitted())); webEngineView->setProperty("url", QUrl(QStringLiteral("data:text/html,%1").arg(htmlData))); - QVERIFY(!spy.isEmpty() || spy.wait()); +#ifdef ENABLE_QML_TESTSUPPORT_API + webEngineView->setTestSupport(m_testSupport.data()); +#endif + QVERIFY(waitForViewportReady(webEngineView)); QCOMPARE(m_view->rootObject()->property("loading"), QVariant(false)); } |