Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team:
  tests: fixed compile of qscriptextensionplugin test with high -jN
  Updated WebKit to 83439de78841f9569ad78e3a84b7b888337b5d18
  Symbian: Fix language mappings for localize_deployment
  Symbian: Only localize the application .rss that needs it, not all .rss
  Revert "Fix sqlite driver memory eating due to close failure"
  Revert "Fix sqlite driver memory eating due to close failure"
  Reduce unnecessary QtCore DLL loads during Symbian app thread creation
  Fix HarfBuzz Thai character SARA AM handling

2 files changed, 1 insertions, 49 deletions

diff --git a/tests/auto/qscriptextensionplugin/qscriptextensionplugin.pro b/tests/auto/qscriptextensionplugin/qscriptextensionplugin.pro
index d4671c8..48f0eb9 100644
--- a/tests/auto/qscriptextensionplugin/qscriptextensionplugin.pro
+++ b/tests/auto/qscriptextensionplugin/qscriptextensionplugin.pro
@@ -1,3 +1,4 @@
 TEMPLATE = subdirs
 CONFIG -= app_bundle
+test.depends = simpleplugin staticplugin
 SUBDIRS = simpleplugin staticplugin test
diff --git a/tests/auto/qsqlquery/tst_qsqlquery.cpp b/tests/auto/qsqlquery/tst_qsqlquery.cpp
index 652a82e..3cbdb63 100644
--- a/tests/auto/qsqlquery/tst_qsqlquery.cpp
+++ b/tests/auto/qsqlquery/tst_qsqlquery.cpp
@@ -215,8 +215,6 @@ private slots:
     void QTBUG_14132();
     void QTBUG_21884_data() { generic_data("QSQLITE"); }
     void QTBUG_21884();
-    void QTBUG_16967_data() { generic_data("QSQLITE"); }
-    void QTBUG_16967(); //clean close
 
     void sqlite_constraint_data() { generic_data("QSQLITE"); }
     void sqlite_constraint();
@@ -3152,53 +3150,6 @@ void tst_QSqlQuery::QTBUG_21884()
     }
 }
 
-/**
-  * This test case test sqlite driver close function. Sqlite driver should close cleanly
-  * even if there is still outstanding prepared statement.
-  */
-void tst_QSqlQuery::QTBUG_16967()
-{
-    QFETCH(QString, dbName);
-    {
-        QSqlDatabase db = QSqlDatabase::database(dbName);
-        CHECK_DATABASE(db);
-        db.close();
-        QCOMPARE(db.lastError().type(), QSqlError::NoError);
-    }
-    {
-        QSqlDatabase db = QSqlDatabase::database(dbName);
-        CHECK_DATABASE(db);
-        QSqlQuery q(db);
-        q.prepare("CREATE TABLE t1 (id INTEGER PRIMARY KEY, str TEXT);");
-        db.close();
-        QCOMPARE(db.lastError().type(), QSqlError::NoError);
-    }
-    {
-        QSqlDatabase db = QSqlDatabase::database(dbName);
-        CHECK_DATABASE(db);
-        QSqlQuery q(db);
-        q.prepare("CREATE TABLE t1 (id INTEGER PRIMARY KEY, str TEXT);");
-        q.exec();
-        db.close();
-        QCOMPARE(db.lastError().type(), QSqlError::NoError);
-    }
-    {
-        QSqlDatabase db = QSqlDatabase::database(dbName);
-        CHECK_DATABASE(db);
-        QSqlQuery q(db);
-        q.exec("INSERT INTO t1 (id, str) VALUES(1, \"test1\");");
-        db.close();
-        QCOMPARE(db.lastError().type(), QSqlError::NoError);
-    }
-    {
-        QSqlDatabase db = QSqlDatabase::database(dbName);
-        CHECK_DATABASE(db);
-        QSqlQuery q(db);
-        q.exec("SELECT * FROM t1;");
-        db.close();
-        QCOMPARE(db.lastError().type(), QSqlError::NoError);
-    }
-}
 
 void tst_QSqlQuery::oraOCINumber()
 {