diff options
author | Andras Becsi <andras.becsi@digia.com> | 2014-07-25 15:53:07 +0200 |
---|---|---|
committer | Andras Becsi <andras.becsi@digia.com> | 2014-08-06 17:20:17 +0200 |
commit | ca30d0374020752d3ac367fdffef88a5c1fe4a48 (patch) | |
tree | d93bb8ca51657febaee379e86c422d91b905a68b /tests/auto/quick/publicapi/tst_publicapi.cpp | |
parent | 7d90b44187cfa8f93df6a6341da41cf8192d18ad (diff) |
Add QQuick API for intercepting navigation requests
Add missing navigationRequested API to be able to intercept
navigation requests. This is useful for ignoring requests
for example in kiosk-like applications that want to restrinct
navigation to a specific url or domain, or want to disable
specific types of navigation requests (e.g. reloading, clicking
links, form submissions).
Change-Id: Ie375e635a3c3566527972d05f5d99b39489c5ca8
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'tests/auto/quick/publicapi/tst_publicapi.cpp')
-rw-r--r-- | tests/auto/quick/publicapi/tst_publicapi.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/tests/auto/quick/publicapi/tst_publicapi.cpp b/tests/auto/quick/publicapi/tst_publicapi.cpp index 57b6e9001..ad54bd12e 100644 --- a/tests/auto/quick/publicapi/tst_publicapi.cpp +++ b/tests/auto/quick/publicapi/tst_publicapi.cpp @@ -47,8 +47,7 @@ #include <QtTest/QtTest> #include <private/qquickwebengineview_p.h> #include <private/qquickwebengineloadrequest_p.h> -// FIXME: Implement! -// #include <qquickwebenginenavigationrequest_p.h> +#include <private/qquickwebenginenavigationrequest_p.h> class tst_publicapi : public QObject { Q_OBJECT @@ -59,7 +58,7 @@ private Q_SLOTS: static QList<const QMetaObject *> typesToCheck = QList<const QMetaObject *>() << &QQuickWebEngineView::staticMetaObject << &QQuickWebEngineLoadRequest::staticMetaObject - // << &QQuickWebEngineNavigationRequest::staticMetaObject + << &QQuickWebEngineNavigationRequest::staticMetaObject ; static QList<const char *> knownEnumNames = QList<const char *>(); @@ -79,10 +78,10 @@ static QStringList expectedAPI = QStringList() << "QQuickWebEngineView.FtpErrorDomain --> ErrorDomain" << "QQuickWebEngineView.DnsErrorDomain --> ErrorDomain" << "QQuickWebEngineView.LinkClickedNavigation --> NavigationType" + << "QQuickWebEngineView.TypedNavigation --> NavigationType" << "QQuickWebEngineView.FormSubmittedNavigation --> NavigationType" << "QQuickWebEngineView.BackForwardNavigation --> NavigationType" << "QQuickWebEngineView.ReloadNavigation --> NavigationType" - << "QQuickWebEngineView.FormResubmittedNavigation --> NavigationType" << "QQuickWebEngineView.OtherNavigation --> NavigationType" << "QQuickWebEngineView.NewViewInWindow --> NewViewDestination" << "QQuickWebEngineView.NewViewInTab --> NewViewDestination" @@ -118,8 +117,7 @@ static QStringList expectedAPI = QStringList() << "QQuickWebEngineLoadRequest.errorDomain --> QQuickWebEngineView::ErrorDomain" << "QQuickWebEngineLoadRequest.errorCode --> int" << "QQuickWebEngineNavigationRequest.url --> QUrl" - << "QQuickWebEngineNavigationRequest.mouseButton --> int" - << "QQuickWebEngineNavigationRequest.keyboardModifiers --> int" + << "QQuickWebEngineNavigationRequest.isMainFrame --> bool" << "QQuickWebEngineNavigationRequest.action --> QQuickWebEngineView::NavigationRequestAction" << "QQuickWebEngineNavigationRequest.navigationType --> QQuickWebEngineView::NavigationType" << "QQuickWebEngineNavigationRequest.actionChanged() --> void" |