diff options
author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-02-04 13:42:56 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-12 17:14:05 +0100 |
commit | 69b0d51b14f93ee4f98baab4ebb1564d67d66402 (patch) | |
tree | 26e9f63864575e45129e5c693a44c6e26d389559 /tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp | |
parent | abaa3cd246375df0573d5d2e3d5c1ea0b4be613f (diff) |
Adjust some widget auto test expectations
More need to be adjusted, but this is a first step.
Also move the QSKIP form tst_QWebEngineFrame::loadInSignalHandlers
to its _data method to avoid seeing the skip message for every entry.
Change-Id: If8d17fd992cb12a4a35cf036f80431e0cab3bb2f
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Diffstat (limited to 'tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp')
-rw-r--r-- | tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp index 8a4e9d3e4..a76e4a2ec 100644 --- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp +++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp @@ -2747,6 +2747,9 @@ public: void tst_QWebEnginePage::errorPageExtension() { +#if !defined(QWEBENGINEPAGE_ERRORPAGEEXTENSION) + QSKIP("QWEBENGINEPAGE_ERRORPAGEEXTENSION"); +#else ErrorPage page; m_view->setPage(&page); @@ -2777,6 +2780,7 @@ void tst_QWebEnginePage::errorPageExtension() QTRY_COMPARE(page.history()->currentItem().url(), QUrl("data:text/html,foo")); m_view->setPage(0); +#endif } void tst_QWebEnginePage::errorPageExtensionInIFrames() |