summaryrefslogtreecommitdiffstats
path: root/src/webengine/api/qquickwebengineview.cpp
diff options
context:
space:
mode:
authorAdam Kallai <kadam@inf.u-szeged.hu>2014-02-24 09:17:39 -0800
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-25 15:08:38 +0100
commite40ebfe6e8fb543e68f3527b9256b60a485106cd (patch)
tree94ac715c04dc20f390910b756a4fa267d6b224da /src/webengine/api/qquickwebengineview.cpp
parente7793c99669f635ea4dab6d025a4db7a45bf718e (diff)
Fixing QQuickWebEngineView.loadingChanged public API test case
Rename QQuickWebEngineView.loadingStateChanged signal name to QQuickWebEngineView.loadingChanged. Change-Id: I0e01034f7b2eea57f5211ff0d8258d9f27d278f0 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'src/webengine/api/qquickwebengineview.cpp')
-rw-r--r--src/webengine/api/qquickwebengineview.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index 0c6ef7ce7..6522137a8 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -224,7 +224,7 @@ void QQuickWebEngineViewPrivate::loadingStateChanged()
m_isLoading = adapter->isLoading();
if (m_isLoading && !wasLoading) {
QQuickWebEngineLoadRequest loadRequest(q->url(), QQuickWebEngineView::LoadStartedStatus);
- Q_EMIT q->loadingStateChanged(&loadRequest);
+ Q_EMIT q->loadingChanged(&loadRequest);
}
}
@@ -251,12 +251,12 @@ void QQuickWebEngineViewPrivate::loadFinished(bool success, int error_code, cons
Q_Q(QQuickWebEngineView);
if (error_code == WebEngineError::UserAbortedError) {
QQuickWebEngineLoadRequest loadRequest(q->url(), QQuickWebEngineView::LoadStoppedStatus);
- Q_EMIT q->loadingStateChanged(&loadRequest);
+ Q_EMIT q->loadingChanged(&loadRequest);
return;
}
if (success) {
QQuickWebEngineLoadRequest loadRequest(q->url(), QQuickWebEngineView::LoadSucceededStatus);
- Q_EMIT q->loadingStateChanged(&loadRequest);
+ Q_EMIT q->loadingChanged(&loadRequest);
return;
}
@@ -267,7 +267,7 @@ void QQuickWebEngineViewPrivate::loadFinished(bool success, int error_code, cons
error_description,
error_code,
static_cast<QQuickWebEngineView::ErrorDomain>(WebEngineError::toQtErrorDomain(error_code)));
- Q_EMIT q->loadingStateChanged(&loadRequest);
+ Q_EMIT q->loadingChanged(&loadRequest);
return;
}
@@ -354,7 +354,7 @@ void QQuickWebEngineViewPrivate::adoptWebContents(WebContentsAdapter *webContent
// FIXME: The current loading state should be stored in the WebContentAdapter
// and it should be checked here if the signal emission is really necessary.
QQuickWebEngineLoadRequest loadRequest(adapter->activeUrl(), QQuickWebEngineView::LoadSucceededStatus);
- emit q->loadingStateChanged(&loadRequest);
+ emit q->loadingChanged(&loadRequest);
emit q->loadProgressChanged();
}