Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into qt-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  doc: Example page now lists images used by the example
  Fix compilation with Sun CC 5.9: it was crashing with this code.
  Apparently fixes some build issues on some old unixes...
  Fixed compile for S60.
  Fix for virtual keyboard poping up when it should not.
  Added a placeholderText(*) property to QLineEdit.
  Fixes: OCI QSqlDatabase.tables() does not work with system tables.
  really fix mingw+msys
  less bizarre code; fix minor mistakes
  compile fix for Qt in namespace
  Assistant: Fix race condition in CLucene indexer.
  remove unused line of code
  Fixed QSqlRelationalTableModel doesn't correctly work with relation in other database schema
  fix for mingw+msys
  Fix a documentation typo.
  QVector: fix const_iterator-=(int)

1 files changed, 16 insertions, 0 deletions

diff --git a/tests/auto/qsqldatabase/tst_qsqldatabase.cpp b/tests/auto/qsqldatabase/tst_qsqldatabase.cpp
index fe7c3ea..f840ca6 100644
--- a/tests/auto/qsqldatabase/tst_qsqldatabase.cpp
+++ b/tests/auto/qsqldatabase/tst_qsqldatabase.cpp
@@ -86,6 +86,8 @@ private slots:
     void open();
     void tables_data() { generic_data(); }
     void tables();
+    void oci_tables_data() { generic_data("QOCI"); }
+    void oci_tables();
     void transaction_data() { generic_data(); }
     void transaction();
     void eventNotification_data() { generic_data(); }
@@ -380,6 +382,7 @@ void tst_QSqlDatabase::dropTestTables(QSqlDatabase db)
     if (db.driverName().startsWith("QOCI")) {
         q.exec("drop user "+qTableName("CREATOR")+" cascade");
         q.exec("drop user "+qTableName("APPUSER")+" cascade");
+        q.exec("DROP TABLE system."+qTableName("mypassword"));
 
     }
 }
@@ -2481,5 +2484,18 @@ void tst_QSqlDatabase::mysql_savepointtest()
     QVERIFY_SQL(q, exec("savepoint foo"));
 }
 
+void tst_QSqlDatabase::oci_tables()
+{
+    QFETCH(QString, dbName);
+    QSqlDatabase db = QSqlDatabase::database(dbName);
+    CHECK_DATABASE(db);
+    QSqlQuery q(db);
+    QString systemTableName("system."+qTableName("mypassword"));
+    QVERIFY_SQL(q, exec("CREATE TABLE "+systemTableName+"(name VARCHAR(20))"));
+    QVERIFY(!db.tables().contains(systemTableName.toUpper()));
+    qDebug() << db.tables(QSql::SystemTables);
+    QVERIFY(db.tables(QSql::SystemTables).contains(systemTableName.toUpper()));
+}
+
 QTEST_MAIN(tst_QSqlDatabase)
 #include "tst_qsqldatabase.moc"