Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (85 commits)
  Add make stub_sis target, and add webkit stub to qt.iby
  Fix to S60 softkeys when no active Qt window or native widget is shown.
  doc:	Fixed several typos.
  Doc: remove \preliminary tag from public multimedia classes
  Fixed the perl download link and description in docs
  Revert WebCore.pro part of 2761e6f57ecd00c3435dbb8a6cf5f40653195d5d to build QtWebKit with THUMB again
  QNAM HTTP: Optimize detectPipeliningSupport()
  QNAM HTTP: Set channel to IdleState at better place
  QXmlSchema: fix crash in schema parser
  We need to export qBadAlloc() on all platforms
  now really fix the message editor for dark backgrounds
  Revert "(ODBC) Use wchar_t instead of assuming 2 bytes."
  Update Symbian DEF files
  Export a function to get dfb-surface from a pixmap
  Fix the WebKit build
  Blinking cursors are 2 pixels wide on Mac OS X/Cocoa.
  Fixed compilation with QT_NO_WHEELEVENT
  Fixed usage of QGLPixelBuffer with share widgets on other X11 screens.
  Fixed drawing QPixmaps on QGLWidgets on different X11 screens.
  Take into account the solaris-cc-64-stlport mkspec
  ...

1 files changed, 20 insertions, 0 deletions

diff --git a/tests/auto/qsqldatabase/tst_qsqldatabase.cpp b/tests/auto/qsqldatabase/tst_qsqldatabase.cpp
index 5b61da2..fe084fa 100644
--- a/tests/auto/qsqldatabase/tst_qsqldatabase.cpp
+++ b/tests/auto/qsqldatabase/tst_qsqldatabase.cpp
@@ -202,6 +202,8 @@ private slots:
     void sqlStatementUseIsNull_189093_data() { generic_data(); }
     void sqlStatementUseIsNull_189093();
 
+    void sqlite_enable_cache_mode_data() { generic_data("QSQLITE"); }
+    void sqlite_enable_cache_mode();
 
 private:
     void createTestTables(QSqlDatabase db);
@@ -2485,5 +2487,23 @@ void tst_QSqlDatabase::oci_tables()
     QVERIFY(db.tables(QSql::SystemTables).contains(systemTableName.toUpper()));
 }
 
+void tst_QSqlDatabase::sqlite_enable_cache_mode()
+{
+    QFETCH(QString, dbName);
+    if(dbName.endsWith(":memory:"))
+        QSKIP( "cache mode is meaningless for :memory: databases", SkipSingle );
+    QSqlDatabase db = QSqlDatabase::database(dbName);
+    CHECK_DATABASE(db);
+    db.close();
+    db.setConnectOptions("QSQLITE_ENABLE_SHARED_CACHE");
+    QVERIFY_SQL(db, open());
+    QSqlDatabase db2 = QSqlDatabase::cloneDatabase(db, dbName+":cachemodeconn2");
+    db2.setConnectOptions("QSQLITE_ENABLE_SHARED_CACHE");
+    QVERIFY_SQL(db2, open());
+    QSqlQuery q(db), q2(db2);
+    QVERIFY_SQL(q, exec("select * from "+qTableName("qtest")));
+    QVERIFY_SQL(q2, exec("select * from "+qTableName("qtest")));
+}
+
 QTEST_MAIN(tst_QSqlDatabase)
 #include "tst_qsqldatabase.moc"