summaryrefslogtreecommitdiff
path: root/Source/WebKit/qt/tests
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebKit/qt/tests')
-rw-r--r--Source/WebKit/qt/tests/qdeclarativewebview/tst_qdeclarativewebview.cpp4
-rw-r--r--Source/WebKit/qt/tests/qwebelement/tst_qwebelement.cpp4
-rw-r--r--Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp4
3 files changed, 0 insertions, 12 deletions
diff --git a/Source/WebKit/qt/tests/qdeclarativewebview/tst_qdeclarativewebview.cpp b/Source/WebKit/qt/tests/qdeclarativewebview/tst_qdeclarativewebview.cpp
index b1722a6fb..3623c6a3f 100644
--- a/Source/WebKit/qt/tests/qdeclarativewebview/tst_qdeclarativewebview.cpp
+++ b/Source/WebKit/qt/tests/qdeclarativewebview/tst_qdeclarativewebview.cpp
@@ -40,9 +40,7 @@ private slots:
void renderingEnabled();
void setHtml();
void settings();
-#if QT_VERSION >= 0x040704
void backgroundColor();
-#endif
private:
void checkNoErrors(const QDeclarativeComponent&);
@@ -505,7 +503,6 @@ void tst_QDeclarativeWebView::settings()
}
}
-#if QT_VERSION >= 0x040704
void tst_QDeclarativeWebView::backgroundColor()
{
// We test here the rendering of the background.
@@ -533,7 +530,6 @@ void tst_QDeclarativeWebView::backgroundColor()
wv->setProperty("backgroundColor", Qt::green);
QCOMPARE(spyColorChanged.count(), 1);
}
-#endif
void tst_QDeclarativeWebView::checkNoErrors(const QDeclarativeComponent& component)
{
diff --git a/Source/WebKit/qt/tests/qwebelement/tst_qwebelement.cpp b/Source/WebKit/qt/tests/qwebelement/tst_qwebelement.cpp
index fb47e4b61..9a208bc47 100644
--- a/Source/WebKit/qt/tests/qwebelement/tst_qwebelement.cpp
+++ b/Source/WebKit/qt/tests/qwebelement/tst_qwebelement.cpp
@@ -1062,11 +1062,7 @@ void tst_QWebElement::render()
QPainter painter(&chunk);
painter.fillRect(chunkRect, Qt::white);
QRect chunkPaintRect(x, 0, chunkWidth, chunkHeight);
-#if QT_VERSION >= QT_VERSION_CHECK(4, 8, 0)
tables[0].render(&painter, chunkPaintRect);
-#else
- tables[0].render(&painter);
-#endif
painter.end();
// The first chunk in this test is passing, but the others are failing
diff --git a/Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp b/Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
index b6f0aeee3..13e7a9f17 100644
--- a/Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
+++ b/Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
@@ -90,9 +90,7 @@ public slots:
private slots:
void initTestCase();
void cleanupTestCase();
-#if QT_VERSION >= 0x040800
void thirdPartyCookiePolicy();
-#endif
void contextMenuCopy();
void contextMenuPopulatedOnce();
void acceptNavigationRequest();
@@ -3042,7 +3040,6 @@ void tst_QWebPage::navigatorCookieEnabled()
QVERIFY(m_page->mainFrame()->evaluateJavaScript("navigator.cookieEnabled").toBool());
}
-#if QT_VERSION >= 0x040800
void tst_QWebPage::thirdPartyCookiePolicy()
{
QWebSettings::globalSettings()->setThirdPartyCookiePolicy(QWebSettings::AlwaysBlockThirdPartyCookies);
@@ -3081,7 +3078,6 @@ void tst_QWebPage::thirdPartyCookiePolicy()
QVERIFY(!DumpRenderTreeSupportQt::thirdPartyCookiePolicyAllows(m_page,
QUrl("http://anotherexample.co.uk"), QUrl("http://example.co.uk")));
}
-#endif
#ifdef Q_OS_MAC
void tst_QWebPage::macCopyUnicodeToClipboard()