diff options
author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-02-06 15:53:24 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-02-06 15:53:24 +0100 |
commit | 7a3e38d779352ca09e9118d735c9a2b0ea55b763 (patch) | |
tree | 1eca845f305d776aa066cabed0a83e0b11bcc8c0 /src/webengine/api/qquickwebenginetestsupport.cpp | |
parent | 9225efb8f8ff0ee75b132b16d93d5c9368b43de8 (diff) | |
parent | fc37a3964db412d110e7513534b6178e154044c4 (diff) |
Merge dev into 5.11
Change-Id: Iad50b7865d6861bb15b85e6abe455aae2802ea4b
Diffstat (limited to 'src/webengine/api/qquickwebenginetestsupport.cpp')
-rw-r--r-- | src/webengine/api/qquickwebenginetestsupport.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/webengine/api/qquickwebenginetestsupport.cpp b/src/webengine/api/qquickwebenginetestsupport.cpp index b3290d3cc..b7b863125 100644 --- a/src/webengine/api/qquickwebenginetestsupport.cpp +++ b/src/webengine/api/qquickwebenginetestsupport.cpp @@ -42,6 +42,7 @@ #include "qquickwebengineloadrequest_p.h" #include <QQuickWindow> #include <QtTest/qtest.h> +#include <QtCore/QTimer> QT_BEGIN_NAMESPACE @@ -56,19 +57,20 @@ QQuickWebEngineErrorPage::QQuickWebEngineErrorPage() void QQuickWebEngineErrorPage::loadFinished(bool success, const QUrl &url) { Q_UNUSED(success); - - QQuickWebEngineLoadRequest loadRequest(url, QQuickWebEngineView::LoadSucceededStatus); - Q_EMIT loadingChanged(&loadRequest); - return; + QTimer::singleShot(0, this, [this, url]() { + QQuickWebEngineLoadRequest loadRequest(url, QQuickWebEngineView::LoadSucceededStatus); + emit loadingChanged(&loadRequest); + }); } void QQuickWebEngineErrorPage::loadStarted(const QUrl &provisionalUrl) { - QQuickWebEngineLoadRequest loadRequest(provisionalUrl, QQuickWebEngineView::LoadStartedStatus); - Q_EMIT loadingChanged(&loadRequest); + QTimer::singleShot(0, this, [this, provisionalUrl]() { + QQuickWebEngineLoadRequest loadRequest(provisionalUrl, QQuickWebEngineView::LoadStartedStatus); + emit loadingChanged(&loadRequest); + }); } - QQuickWebEngineTestInputContext::QQuickWebEngineTestInputContext() : m_visible(false) { |