summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2010-03-03 04:58:55 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2010-03-03 04:58:55 (GMT)
commita40a5fde406855473ba5f4cfa78208ee5efd9cb1 (patch)
treeb42879000297b3e41669f794f82c73e2e5fe96b5
parent6e486bdd5cc8370df7752eda2fa9f75b0a962124 (diff)
downloadQt-a40a5fde406855473ba5f4cfa78208ee5efd9cb1.zip
Qt-a40a5fde406855473ba5f4cfa78208ee5efd9cb1.tar.gz
Qt-a40a5fde406855473ba5f4cfa78208ee5efd9cb1.tar.bz2
fix crash, re-enable settings test
-rw-r--r--tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp b/tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp
index f2ea076..b63e14b 100644
--- a/tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp
+++ b/tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp
@@ -181,9 +181,8 @@ void tst_qdeclarativewebview::settings()
QVERIFY(wv != 0);
QTRY_COMPARE(wv->property("progress").toDouble(), 1.0);
- qWarning("Need to test settings");
- /*
- QObject *s = qvariant_cast<QObject*>(wv->property("settings"));
+ QObject *s = QDeclarativeProperty(wv,"settings").object();
+ QVERIFY(s != 0);
// merely tests that setting gets stored (in QWebSettings)
// behavioural tests are in WebKit.
@@ -238,7 +237,6 @@ void tst_qdeclarativewebview::settings()
QVERIFY(s->property("privateBrowsingEnabled") == on);
QVERIFY(s->property("zoomTextOnly") == on);
}
- */
}
void tst_qdeclarativewebview::historyNav()