summaryrefslogtreecommitdiff
path: root/Source/WebKit/qt/tests/qdeclarativewebview/tst_qdeclarativewebview.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2012-07-23 09:28:44 +0200
committerSimon Hausmann <simon.hausmann@nokia.com>2012-07-23 09:28:44 +0200
commit815f1ed417bd26fbe2abbdf20ac5d3423b30796c (patch)
tree923c9a9e2834ccab60f5caecfb8f0ac410c1dd9e /Source/WebKit/qt/tests/qdeclarativewebview/tst_qdeclarativewebview.cpp
parentb4ad5d9d2b96baacd0180ead50de5195ca78af2d (diff)
downloadqtwebkit-815f1ed417bd26fbe2abbdf20ac5d3423b30796c.tar.gz
Imported WebKit commit e65cbc5b6ac32627c797e7fc7f46eb7794410c92 (http://svn.webkit.org/repository/webkit/trunk@123308)
New snapshot with better configure tests
Diffstat (limited to 'Source/WebKit/qt/tests/qdeclarativewebview/tst_qdeclarativewebview.cpp')
-rw-r--r--Source/WebKit/qt/tests/qdeclarativewebview/tst_qdeclarativewebview.cpp4
1 files changed, 0 insertions, 4 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)
{