2 files changed, 22 insertions, 11 deletions

diff --git a/tests/auto/qsqltablemodel/qsqltablemodel.pro b/tests/auto/qsqltablemodel/qsqltablemodel.pro
index cf5fbea3cb..a046fb16aa 100644
--- a/tests/auto/qsqltablemodel/qsqltablemodel.pro
+++ b/tests/auto/qsqltablemodel/qsqltablemodel.pro
@@ -6,8 +6,15 @@ QT += sql
 wince*: {
    plugFiles.sources = ../../../plugins/sqldrivers
    plugFiles.path    = .
-   DEPLOYMENT += plugFiles 
-} else {
+   DEPLOYMENT += plugFiles
+   LIBS += -lws2
+}else:symbian {
+    contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
+        sqlite.path = /sys/bin
+        sqlite.sources = sqlite3.dll
+        DEPLOYMENT += sqlite
+    }
+}else {
    win32:LIBS += -lws2_32
 }
 
diff --git a/tests/auto/qsqltablemodel/tst_qsqltablemodel.cpp b/tests/auto/qsqltablemodel/tst_qsqltablemodel.cpp
index a04cff4efa..316324d79f 100644
--- a/tests/auto/qsqltablemodel/tst_qsqltablemodel.cpp
+++ b/tests/auto/qsqltablemodel/tst_qsqltablemodel.cpp
@@ -148,7 +148,7 @@ void tst_QSqlTableModel::dropTestTables()
                    << qTableName("bigtable")
                    << qTableName("foo");
         if (testWhiteSpaceNames(db.driverName()))
-            tableNames << qTableName("qtestw hitespace");
+            tableNames << qTableName("qtestw hitespace", db.driver());
 
         tst_Databases::safeDropTables(db, tableNames);
 
@@ -280,9 +280,9 @@ void tst_QSqlTableModel::setRecord()
     QSqlDatabase db = QSqlDatabase::database(dbName);
     CHECK_DATABASE(db);
 
-    QList<QSqlTableModel::EditStrategy> policies = QList<QSqlTableModel::EditStrategy>() << QSqlTableModel::OnFieldChange << QSqlTableModel::OnManualSubmit <<  QSqlTableModel::OnRowChange;
+    QList<QSqlTableModel::EditStrategy> policies = QList<QSqlTableModel::EditStrategy>() << QSqlTableModel::OnFieldChange << QSqlTableModel::OnRowChange << QSqlTableModel::OnManualSubmit;
 
-    QString x;
+    QString Xsuffix;
     foreach( QSqlTableModel::EditStrategy submitpolicy, policies) {
 
         QSqlTableModel model(0, db);
@@ -301,6 +301,8 @@ void tst_QSqlTableModel::setRecord()
 
             if ((QSqlTableModel::EditStrategy)submitpolicy == QSqlTableModel::OnManualSubmit)
                 QVERIFY(model.submitAll());
+            else if ((QSqlTableModel::EditStrategy)submitpolicy == QSqlTableModel::OnRowChange && i == model.rowCount() -1)
+                model.submit();
             else {
                 // dataChanged() is not emitted when submitAll() is called
                 QCOMPARE(spy.count(), 2);
@@ -309,11 +311,13 @@ void tst_QSqlTableModel::setRecord()
                 QCOMPARE(qvariant_cast<QModelIndex>(spy.at(0).at(1)), model.index(i, 1));
             }
         }
-        x+=QString('X');
-        QCOMPARE(model.data(model.index(0, 1)).toString(), QString("foo")+x);
-        QCOMPARE(model.data(model.index(0, 2)).toString(), QString("bar")+x);
-        QCOMPARE(model.data(model.index(1, 1)).toString(), QString("baz")+x);
-        QCOMPARE(model.data(model.index(1, 2)).toString(), QString("joe")+x);
+
+        Xsuffix.append('X');
+
+        QCOMPARE(model.data(model.index(0, 1)).toString(), QString("foo").append(Xsuffix));
+        QCOMPARE(model.data(model.index(0, 2)).toString(), QString("bar").append(Xsuffix));
+        QCOMPARE(model.data(model.index(1, 1)).toString(), QString("baz").append(Xsuffix));
+        QCOMPARE(model.data(model.index(1, 2)).toString(), QString("joe").append(Xsuffix));
     }
 }
 
@@ -900,7 +904,7 @@ void tst_QSqlTableModel::sqlite_attachedDatabase()
     QVERIFY_SQL( q, exec("INSERT INTO atest2 VALUES(2, 'attached-atest2')"));
 
     QSqlQuery q2(db);
-    tst_Databases::safeDropTables(db, QStringList() << "atest");
+    tst_Databases::safeDropTable(db, "atest");
     QVERIFY_SQL(q2, exec("CREATE TABLE atest(id int, text varchar(20))"));
     QVERIFY_SQL(q2, exec("INSERT INTO atest VALUES(3, 'main')"));
     QVERIFY_SQL(q2, exec("ATTACH DATABASE \""+attachedDb.databaseName()+"\" as adb"));