diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-09-13 12:51:20 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 20:50:05 +0200 |
| commit | d441d6f39bb846989d95bcf5caf387b42414718d (patch) | |
| tree | e367e64a75991c554930278175d403c072de6bb8 /Source/WebKit2/UIProcess/API/qt/tests/util.cpp | |
| parent | 0060b2994c07842f4c59de64b5e3e430525c4b90 (diff) | |
| download | qtwebkit-d441d6f39bb846989d95bcf5caf387b42414718d.tar.gz | |
Import Qt5x2 branch of QtWebkit for Qt 5.2
Importing a new snapshot of webkit.
Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'Source/WebKit2/UIProcess/API/qt/tests/util.cpp')
| -rw-r--r-- | Source/WebKit2/UIProcess/API/qt/tests/util.cpp | 35 |
1 files changed, 13 insertions, 22 deletions
diff --git a/Source/WebKit2/UIProcess/API/qt/tests/util.cpp b/Source/WebKit2/UIProcess/API/qt/tests/util.cpp index fce3cc7f6..3b0c45f7d 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/util.cpp +++ b/Source/WebKit2/UIProcess/API/qt/tests/util.cpp @@ -74,26 +74,6 @@ void suppressDebugOutput() } #if defined(HAVE_QTQUICK) && HAVE_QTQUICK -class LoadSpy : public QEventLoop { - Q_OBJECT -public: - LoadSpy(QQuickWebView* webView) - { - connect(webView, SIGNAL(loadingChanged(QWebLoadRequest*)), SLOT(onLoadingChanged(QWebLoadRequest*))); - } -Q_SIGNALS: - void loadSucceeded(); - void loadFailed(); -private Q_SLOTS: - void onLoadingChanged(QWebLoadRequest* loadRequest) - { - if (loadRequest->status() == QQuickWebView::LoadSucceededStatus) - emit loadSucceeded(); - else if (loadRequest->status() == QQuickWebView::LoadFailedStatus) - emit loadFailed(); - } -}; - bool waitForLoadSucceeded(QQuickWebView* webView, int timeout) { QEventLoop loop; @@ -133,6 +113,19 @@ bool waitForViewportReady(QQuickWebView* webView, int timeout) return waitForSignal(webView->experimental(), SIGNAL(loadVisuallyCommitted()), timeout); } +LoadSpy::LoadSpy(QQuickWebView* webView) +{ + connect(webView, SIGNAL(loadingChanged(QWebLoadRequest*)), SLOT(onLoadingChanged(QWebLoadRequest*))); +} + +void LoadSpy::onLoadingChanged(QWebLoadRequest* loadRequest) +{ + if (loadRequest->status() == QQuickWebView::LoadSucceededStatus) + emit loadSucceeded(); + else if (loadRequest->status() == QQuickWebView::LoadFailedStatus) + emit loadFailed(); +} + LoadStartedCatcher::LoadStartedCatcher(QQuickWebView* webView) : m_webView(webView) { @@ -148,5 +141,3 @@ void LoadStartedCatcher::onLoadingChanged(QWebLoadRequest* loadRequest) } } #endif - -#include "util.moc" |