diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2016-08-25 19:20:41 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-02-02 12:30:55 +0000 |
| commit | 6882a04fb36642862b11efe514251d32070c3d65 (patch) | |
| tree | b7959826000b061fd5ccc7512035c7478742f7b0 /Source/WebKit/qt/tests/qwebpage | |
| parent | ab6df191029eeeb0b0f16f127d553265659f739e (diff) | |
| download | qtwebkit-6882a04fb36642862b11efe514251d32070c3d65.tar.gz | |
Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443)
Change-Id: I3b1d8a2808782c9f34d50240000e20cb38d3680f
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Source/WebKit/qt/tests/qwebpage')
| -rw-r--r-- | Source/WebKit/qt/tests/qwebpage/qwebpage.pro | 3 | ||||
| -rw-r--r-- | Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp | 4 |
2 files changed, 1 insertions, 6 deletions
diff --git a/Source/WebKit/qt/tests/qwebpage/qwebpage.pro b/Source/WebKit/qt/tests/qwebpage/qwebpage.pro deleted file mode 100644 index e56bbe8f7..000000000 --- a/Source/WebKit/qt/tests/qwebpage/qwebpage.pro +++ /dev/null @@ -1,3 +0,0 @@ -include(../tests.pri) -exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc -QT *= core-private gui-private diff --git a/Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp b/Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp index 53e655749..6e239f67d 100644 --- a/Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp +++ b/Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp @@ -618,7 +618,7 @@ void tst_QWebPage::userStyleSheetFromQrcUrl() void tst_QWebPage::loadHtml5Video() { -#if defined(WTF_USE_QT_MULTIMEDIA) && WTF_USE_QT_MULTIMEDIA +#if defined(USE_QT_MULTIMEDIA) && USE_QT_MULTIMEDIA QByteArray url("http://does.not/exist?a=1%2Cb=2"); m_view->setHtml("<p><video id ='video' src='" + url + "' autoplay/></p>"); QTest::qWait(2000); @@ -3189,7 +3189,6 @@ void tst_QWebPage::macCopyUnicodeToClipboard() void tst_QWebPage::changeVisibilityState() { -#if ENABLE_PAGE_VISIBILITY_API QVariant stateBool, stateString, cpt; m_page->mainFrame()->setHtml("<html><body></body></html>"); @@ -3260,7 +3259,6 @@ void tst_QWebPage::changeVisibilityState() QVERIFY(stateString.type() == QVariant::String && stateString.toString() == QString("visible")); cpt = m_page->mainFrame()->evaluateJavaScript("cpt"); QVERIFY(cpt.type() == QVariant::Double && cpt.toDouble() == 5); -#endif } void tst_QWebPage::contextMenuCopy() |