From 6ffb1797617c65bef34d7ce19b07ab07db89aa0b Mon Sep 17 00:00:00 2001 From: Jocelyn Turcotte Date: Fri, 16 Aug 2013 18:41:02 +0200 Subject: Implement QWebEnginePage::action for basic navigation. This imports code from qwebpage.cpp and QWebPageAdapter.cpp of WebKit into qwebenginepage.cpp and thus also restrict the license accordingly. Change-Id: Ic5da8f2b469109cb10132cbe6585f2d941b14403 Reviewed-by: Andras Becsi --- tests/widgets/qwebenginepage/tst_qwebenginepage.cpp | 8 -------- 1 file changed, 8 deletions(-) (limited to 'tests') diff --git a/tests/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/widgets/qwebenginepage/tst_qwebenginepage.cpp index f80b6ac73..0c11c6c16 100644 --- a/tests/widgets/qwebenginepage/tst_qwebenginepage.cpp +++ b/tests/widgets/qwebenginepage/tst_qwebenginepage.cpp @@ -382,9 +382,6 @@ void tst_QWebEnginePage::loadFinished() void tst_QWebEnginePage::actionStates() { -#if !defined(QWEBENGINEPAGE_ACTION) - QSKIP("QWEBENGINEPAGE_ACTION"); -#else QWebEnginePage* page = m_view->page(); page->load(QUrl("qrc:///resources/script.html")); @@ -394,7 +391,6 @@ void tst_QWebEnginePage::actionStates() QTRY_VERIFY(reloadAction->isEnabled()); QTRY_VERIFY(!stopAction->isEnabled()); -#endif } class ConsolePage : public QWebEnginePage @@ -1672,9 +1668,6 @@ void tst_QWebEnginePage::loadCachedPage() void tst_QWebEnginePage::backActionUpdate() { -#if !defined(QWEBENGINEPAGE_ACTION) - QSKIP("QWEBENGINEPAGE_ACTION"); -#else QWebEngineView view; QWebEnginePage *page = view.page(); QAction *action = page->action(QWebEnginePage::Back); @@ -1688,7 +1681,6 @@ void tst_QWebEnginePage::backActionUpdate() QTRY_COMPARE(loadSpy.count(), 2); QVERIFY(action->isEnabled()); -#endif } #if defined(QWEBENGINEFRAME) -- cgit v1.2.3