diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-09-24 04:51:26 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-09-24 04:52:01 (GMT) |
| commit | 04ec3b71ff6327a17da2c5044a4086e9eddca5cd (patch) | |
| tree | d64f349274b7d201d00e8d2b81915b5c61fc27e4 | |
| parent | 9b6a71ec68edf836ab29cc3e5db71b53fe3d9346 (diff) | |
| download | Qt-04ec3b71ff6327a17da2c5044a4086e9eddca5cd.zip Qt-04ec3b71ff6327a17da2c5044a4086e9eddca5cd.tar.gz Qt-04ec3b71ff6327a17da2c5044a4086e9eddca5cd.tar.bz2 | |
Track changes from qtwebkit-4.6-snapshot-18092009
Tidy js.
| -rw-r--r-- | tests/auto/declarative/sql/data/test1.js | 3 | ||||
| -rw-r--r-- | tests/auto/declarative/sql/tst_sql.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/auto/declarative/sql/data/test1.js b/tests/auto/declarative/sql/data/test1.js index 2ae9988..ea3b7b0 100644 --- a/tests/auto/declarative/sql/data/test1.js +++ b/tests/auto/declarative/sql/data/test1.js @@ -1,5 +1,4 @@ -var db; -db = openDatabase("QmlTestDB", "", "Test database from Qt autotests", 1000000); +var db = openDatabase("QmlTestDB", "", "Test database from Qt autotests", 1000000); var r="testerror"; // Asynchronous in WebKit, so must wait before calling test() diff --git a/tests/auto/declarative/sql/tst_sql.cpp b/tests/auto/declarative/sql/tst_sql.cpp index 3179c99..b0a6021 100644 --- a/tests/auto/declarative/sql/tst_sql.cpp +++ b/tests/auto/declarative/sql/tst_sql.cpp @@ -91,6 +91,8 @@ void tst_sql::verifyAgainstWebKit() QWebPageWithJavaScriptConsoleMessages webpage; QDir().mkpath(tmpdir); webpage.settings()->setOfflineStoragePath(tmpdir); + webpage.settings()->setAttribute(QWebSettings::OfflineStorageDatabaseEnabled, true); + webpage.mainFrame()->evaluateJavaScript(js); QTest::qWait(200); // WebKit db access is asynchronous QTRY_COMPARE(webpage.mainFrame()->evaluateJavaScript("test()").toString(),result); |