Merge upstream/4.6 into oslo-staging-2/4.6

Conflicts:
	src/s60installs/bwins/QtGuiu.def

5 files changed, 116 insertions, 5 deletions

diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index d5d72a7..92d29ae 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -148,7 +148,6 @@ SUBDIRS += \
            qfontmetrics \
            qftp \
            qgetputenv \
-           qgl \
            qglobal \
            qgraphicseffect \
            qgraphicseffectsource \
@@ -458,7 +457,9 @@ SUBDIRS += \
            rcc \
            windowsmobile
 
-!wince*:SUBDIRS += $$Q3SUBDIRS
+contains(QT_CONFIG,opengl):SUBDIRS += qgl
+
+contains(QT_CONFIG,qt3support):!wince*:SUBDIRS += $$Q3SUBDIRS
 
 contains(QT_CONFIG, OdfWriter):SUBDIRS += qzip qtextodfwriter
 mac: {
diff --git a/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp b/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp
index 44adf7e..a47cabb 100644
--- a/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp
+++ b/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp
@@ -1630,6 +1630,29 @@ void tst_QScriptExtQObject::connectAndDisconnect()
     m_myObject->emitMySignalWithVariantArg(123);
     QCOMPARE(m_engine->evaluate("gotSignal").toBoolean(), true);
     QCOMPARE(m_engine->evaluate("signalArgs.length").toNumber(), 1.0);
+    QCOMPARE(m_engine->evaluate("signalArgs[0]").toNumber(), 123.0);
+    QVERIFY(m_engine->evaluate("myObject.mySignalWithVariantArg.disconnect(myHandler)").isUndefined());
+
+    // signal with argument type that's unknown to the meta-type system
+    m_myObject->clearConnectedSignal();
+    QVERIFY(m_engine->evaluate("myObject.mySignalWithScriptEngineArg.connect(myHandler)").isUndefined());
+    QCOMPARE(m_myObject->connectedSignal().constData(), SIGNAL(mySignalWithScriptEngineArg(QScriptEngine*)));
+    m_engine->evaluate("gotSignal = false");
+    QTest::ignoreMessage(QtWarningMsg, "QScriptEngine: Unable to handle unregistered datatype 'QScriptEngine*' when invoking handler of signal MyQObject::mySignalWithScriptEngineArg(QScriptEngine*)");
+    m_myObject->emitMySignalWithScriptEngineArg(m_engine);
+    QCOMPARE(m_engine->evaluate("gotSignal").toBoolean(), true);
+    QCOMPARE(m_engine->evaluate("signalArgs.length").toNumber(), 1.0);
+    QVERIFY(m_engine->evaluate("signalArgs[0]").isUndefined());
+    QVERIFY(m_engine->evaluate("myObject.mySignalWithScriptEngineArg.disconnect(myHandler)").isUndefined());
+
+    // signal with QVariant arg: argument conversion should work
+    m_myObject->clearConnectedSignal();
+    QVERIFY(m_engine->evaluate("myObject.mySignalWithVariantArg.connect(myHandler)").isUndefined());
+    QCOMPARE(m_myObject->connectedSignal().constData(), SIGNAL(mySignalWithVariantArg(QVariant)));
+    m_engine->evaluate("gotSignal = false");
+    m_myObject->emitMySignalWithVariantArg(123);
+    QCOMPARE(m_engine->evaluate("gotSignal").toBoolean(), true);
+    QCOMPARE(m_engine->evaluate("signalArgs.length").toNumber(), 1.0);
     QVERIFY(m_engine->evaluate("signalArgs[0]").isNumber());
     QCOMPARE(m_engine->evaluate("signalArgs[0]").toNumber(), 123.0);
     QVERIFY(m_engine->evaluate("myObject.mySignalWithVariantArg.disconnect(myHandler)").isUndefined());
diff --git a/tests/auto/qsqlquery/tst_qsqlquery.cpp b/tests/auto/qsqlquery/tst_qsqlquery.cpp
index 4264a70..a8908fd 100644
--- a/tests/auto/qsqlquery/tst_qsqlquery.cpp
+++ b/tests/auto/qsqlquery/tst_qsqlquery.cpp
@@ -199,6 +199,8 @@ private slots:
 
     void QTBUG_5251_data() { generic_data("QPSQL"); }
     void QTBUG_5251();
+    void QTBUG_6421_data() { generic_data("QOCI"); }
+    void QTBUG_6421();
 
 private:
     // returns all database connections
@@ -302,7 +304,8 @@ void tst_QSqlQuery::dropTestTables( QSqlDatabase db )
                << qTableName( "more_results" )
                << qTableName( "blobstest" )
                << qTableName( "oraRowId" )
-               << qTableName( "qtest_batch" );
+               << qTableName( "qtest_batch" )
+               << qTableName(QLatin1String("bug6421")).toUpper();
 
     if ( db.driverName().startsWith("QPSQL") )
         tablenames << qTableName("task_233829");
@@ -2935,5 +2938,28 @@ void tst_QSqlQuery::QTBUG_5251()
 
 }
 
+void tst_QSqlQuery::QTBUG_6421()
+{
+    QFETCH( QString, dbName );
+    QSqlDatabase db = QSqlDatabase::database( dbName );
+    CHECK_DATABASE( db );
+
+    QSqlQuery q(db);
+    QString tableName=qTableName(QLatin1String("bug6421")).toUpper();
+
+    QVERIFY_SQL(q, exec("create table "+tableName+"(COL1 char(10), COL2 char(10), COL3 char(10))"));
+    QVERIFY_SQL(q, exec("create index INDEX1 on "+tableName+" (COL1 desc)"));
+    QVERIFY_SQL(q, exec("create index INDEX2 on "+tableName+" (COL2 desc)"));
+    QVERIFY_SQL(q, exec("create index INDEX3 on "+tableName+" (COL3 desc)"));
+    q.setForwardOnly(true);
+    QVERIFY_SQL(q, exec("select COLUMN_EXPRESSION from ALL_IND_EXPRESSIONS where TABLE_NAME='"+tableName+"'"));
+    QVERIFY_SQL(q, next());
+    QCOMPARE(q.value(0).toString(), QLatin1String("\"COL1\""));
+    QVERIFY_SQL(q, next());
+    QCOMPARE(q.value(0).toString(), QLatin1String("\"COL2\""));
+    QVERIFY_SQL(q, next());
+    QCOMPARE(q.value(0).toString(), QLatin1String("\"COL3\""));
+}
+
 QTEST_MAIN( tst_QSqlQuery )
 #include "tst_qsqlquery.moc"
diff --git a/tests/auto/qtextcursor/tst_qtextcursor.cpp b/tests/auto/qtextcursor/tst_qtextcursor.cpp
index d910c8d..d0c2afd 100644
--- a/tests/auto/qtextcursor/tst_qtextcursor.cpp
+++ b/tests/auto/qtextcursor/tst_qtextcursor.cpp
@@ -149,6 +149,8 @@ private slots:
 
     void adjustCursorsOnInsert();
 
+    void cursorPositionWithBlockUndoAndRedo();
+
 private:
     int blockCount();
 
@@ -1747,9 +1749,33 @@ void tst_QTextCursor::adjustCursorsOnInsert()
     QCOMPARE(selection.anchor(), posAfter);
     doc->undo();
 
+}
+void tst_QTextCursor::cursorPositionWithBlockUndoAndRedo()
+{
+    cursor.insertText("AAAABBBBCCCCDDDD");
+    cursor.beginEditBlock();
+    cursor.setPosition(12);
+    int cursorPositionBefore = cursor.position();
+    cursor.insertText("*");
+    cursor.setPosition(8);
+    cursor.insertText("*");
+    cursor.setPosition(4);
+    cursor.insertText("*");
+    cursor.setPosition(0);
+    cursor.insertText("*");
+    int cursorPositionAfter = cursor.position();
+    cursor.endEditBlock();
 
+    QVERIFY(doc->toPlainText() == "*AAAA*BBBB*CCCC*DDDD");
+    QCOMPARE(12, cursorPositionBefore);
+    QCOMPARE(1, cursorPositionAfter);
 
-
+    doc->undo(&cursor);
+    QVERIFY(doc->toPlainText() == "AAAABBBBCCCCDDDD");
+    QCOMPARE(cursor.position(), cursorPositionBefore);
+    doc->redo(&cursor);
+    QVERIFY(doc->toPlainText() == "*AAAA*BBBB*CCCC*DDDD");
+    QCOMPARE(cursor.position(), cursorPositionAfter);
 }
 
 QTEST_MAIN(tst_QTextCursor)
diff --git a/tests/benchmarks/qdir/tst_qdir.cpp b/tests/benchmarks/qdir/tst_qdir.cpp
index fd558d3..64c6ba1 100644
--- a/tests/benchmarks/qdir/tst_qdir.cpp
+++ b/tests/benchmarks/qdir/tst_qdir.cpp
@@ -78,6 +78,8 @@ public slots:
         temp.rmdir(QLatin1String("test_speed"));
     }
 private slots:
+    void baseline() {}
+
     void sizeSpeed() {
         QDir testdir(QDir::tempPath() + QLatin1String("/test_speed"));
         QBENCHMARK {
@@ -88,6 +90,18 @@ private slots:
             }
         }
     }
+    void sizeSpeedIterator() {
+        QDir testdir(QDir::tempPath() + QLatin1String("/test_speed"));
+        QBENCHMARK {
+            QDirIterator dit(testdir.path(), QDir::Files);
+            while (dit.hasNext()) {
+                dit.fileInfo().isDir();
+                dit.fileInfo().size();
+                dit.next();
+            }
+        }
+    }
+
     void sizeSpeedWithoutFilter() {
         QDir testdir(QDir::tempPath() + QLatin1String("/test_speed"));
         QBENCHMARK {
@@ -97,6 +111,18 @@ private slots:
             }
         }
     }
+    void sizeSpeedWithoutFilterIterator() {
+        QDir testdir(QDir::tempPath() + QLatin1String("/test_speed"));
+        QBENCHMARK {
+            QDirIterator dit(testdir.path());
+            while (dit.hasNext()) {
+                dit.fileInfo().isDir();
+                dit.fileInfo().size();
+                dit.next();
+            }
+        }
+    }
+
     void sizeSpeedWithoutFileInfoList() {
         QDir testdir(QDir::tempPath() + QLatin1String("/test_speed"));
         testdir.setSorting(QDir::Unsorted);
@@ -108,6 +134,7 @@ private slots:
             }
         }
     }
+
     void iDontWantAnyStat() {
         QDir testdir(QDir::tempPath() + QLatin1String("/test_speed"));
         testdir.setSorting(QDir::Unsorted);
@@ -119,8 +146,16 @@ private slots:
             }
         }
     }
+    void iDontWantAnyStatIterator() {
+        QBENCHMARK {
+            QDirIterator dit(QDir::tempPath() + QLatin1String("/test_speed"));
+            while (dit.hasNext()) {
+                dit.next();
+            }
+        }
+    }
 
-    void testLowLevel() {
+    void sizeSpeedWithoutFilterLowLevel() {
 #ifdef Q_OS_WIN
         const wchar_t *dirpath = (wchar_t*)testdir.absolutePath().utf16();
         wchar_t appendedPath[MAX_PATH];