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:
  Add benchmark for QtScript translation functions.
  Fix translation context for qsTr.
  Put symbian-specific test inside symbian qmake scope.
  Remove this unnecessary and verbose line.
  Proper fix for QTBUG-6421
  fix -nomake tools configure option for Windows CE / Symbian
  Compilation fix for Windows Mobile

8 files changed, 48 insertions, 12 deletions

diff --git a/projects.pro b/projects.pro
index 497acd0..d405a5b 100644
--- a/projects.pro
+++ b/projects.pro
@@ -48,7 +48,7 @@ for(PROJECT, $$list($$lower($$unique(QT_BUILD_PARTS)))) {
        contains(QT_BUILD_PARTS, tools) {
           include(translations/translations.pri)  # ts targets
        } else {
-          SUBDIRS += tools/linguist/lrelease
+          !wince*:!symbian:SUBDIRS += tools/linguist/lrelease
        }
        SUBDIRS += translations                    # qm build step
     } else:isEqual(PROJECT, qmake) {
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp
index b6aa872..1879367 100644
--- a/src/script/api/qscriptengine.cpp
+++ b/src/script/api/qscriptengine.cpp
@@ -33,6 +33,7 @@
 #include "qscriptvalue_p.h"
 #include "qscriptvalueiterator.h"
 #include "qscriptclass.h"
+#include "qscriptcontextinfo.h"
 #include "qscriptprogram.h"
 #include "qscriptprogram_p.h"
 #include "qdebug.h"
@@ -698,9 +699,9 @@ JSC::JSValue JSC_HOST_CALL functionQsTr(JSC::ExecState *exec, JSC::JSObject*, JS
         return JSC::throwError(exec, JSC::GeneralError, "qsTranslate(): third argument (n) must be a number");
 #ifndef QT_NO_QOBJECT
     QString context;
-// ### implement context resolution
-//    if (ctx->parentContext())
-//        context = QFileInfo(ctx->parentContext()->fileName()).baseName();
+    QScriptContext *ctx = QScriptEnginePrivate::contextForFrame(exec);
+    if (ctx && ctx->parentContext())
+        context = QFileInfo(QScriptContextInfo(ctx->parentContext()).fileName()).baseName();
 #endif
     QString text(args.at(0).toString(exec));
 #ifndef QT_NO_QOBJECT
diff --git a/src/sql/drivers/sqlite/qsql_sqlite.cpp b/src/sql/drivers/sqlite/qsql_sqlite.cpp
index 8355de2..c62f15c 100644
--- a/src/sql/drivers/sqlite/qsql_sqlite.cpp
+++ b/src/sql/drivers/sqlite/qsql_sqlite.cpp
@@ -122,14 +122,14 @@ public:
 
     sqlite3_stmt *stmt;
 
-    uint skippedStatus: 1; // the status of the fetchNext() that's skipped
-    uint skipRow: 1; // skip the next fetchNext()?
-    uint utf8: 1;
+    bool skippedStatus; // the status of the fetchNext() that's skipped
+    bool skipRow; // skip the next fetchNext()?
     QSqlRecord rInf;
+    QVector<QVariant> firstRow;
 };
 
 QSQLiteResultPrivate::QSQLiteResultPrivate(QSQLiteResult* res) : q(res), access(0),
-    stmt(0), skippedStatus(false), skipRow(false), utf8(false)
+    stmt(0), skippedStatus(false), skipRow(false)
 {
 }
 
@@ -189,10 +189,17 @@ bool QSQLiteResultPrivate::fetchNext(QSqlCachedResult::ValueCache &values, int i
         // already fetched
         Q_ASSERT(!initialFetch);
         skipRow = false;
+        for(int i=0;i<firstRow.count();i++)
+            values[i]=firstRow[i];
         return skippedStatus;
     }
     skipRow = initialFetch;
 
+    if(initialFetch) {
+        firstRow.clear();
+        firstRow.resize(sqlite3_column_count(stmt));
+    }
+
     if (!stmt) {
         q->setLastError(QSqlError(QCoreApplication::translate("QSQLiteResult", "Unable to fetch row"),
                                   QCoreApplication::translate("QSQLiteResult", "No query"), QSqlError::ConnectionError));
@@ -399,7 +406,7 @@ bool QSQLiteResult::exec()
                         "Parameter count mismatch"), QString(), QSqlError::StatementError));
         return false;
     }
-    d->skippedStatus = d->fetchNext(cache(), 0, true);
+    d->skippedStatus = d->fetchNext(d->firstRow, 0, true);
     if (lastError().isValid()) {
         setSelect(false);
         setActive(false);
diff --git a/src/sql/kernel/qsqlcachedresult.cpp b/src/sql/kernel/qsqlcachedresult.cpp
index b4a9241..2e4d19e 100644
--- a/src/sql/kernel/qsqlcachedresult.cpp
+++ b/src/sql/kernel/qsqlcachedresult.cpp
@@ -278,6 +278,11 @@ bool QSqlCachedResult::cacheNext()
     if (d->atEnd)
         return false;
 
+    if(isForwardOnly()) {
+        d->cache.clear();
+        d->cache.resize(d->colCount);
+    }
+
     if (!gotoNext(d->cache, d->nextIndex())) {
         d->revertLast();
         d->atEnd = true;
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 5041812..4215e97 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -443,7 +443,6 @@ SUBDIRS += \
            qsharedmemory \
            qsidebar \
            qsizegrip \
-           qsoftkeymanager \
            qsqldriver \
            qsystemsemaphore \
            qtconcurrentfilter \
@@ -478,6 +477,10 @@ embedded:!wince* {
     SUBDIRS += qtextpiecetable
 }
 
+symbian {
+    SUBDIRS += qsoftkeymanager
+}
+
 # Enable the tests specific to QtXmlPatterns. If you add a test, remember to
 # update runQtXmlPatternsTests.sh too. Remember that this file, auto.pro, is
 # not respected by some test system, they just have a script which loop over
diff --git a/tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp b/tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
index d3087dc..ab110e6 100644
--- a/tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
+++ b/tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
@@ -146,7 +146,7 @@ void tst_QGraphicsLinearLayout::initTestCase()
 {
     // since the style will influence the results, we have to ensure
     // that the tests are run using the same style on all platforms
-#ifdef Q_WS_S60
+#if defined( Q_WS_S60 )|| defined (Q_WS_WINCE)
     QApplication::setStyle(new QWindowsStyle);
 #else
     QApplication::setStyle(new QPlastiqueStyle);
diff --git a/tests/auto/qsqldatabase/tst_qsqldatabase.cpp b/tests/auto/qsqldatabase/tst_qsqldatabase.cpp
index f840ca6..cb4e103 100644
--- a/tests/auto/qsqldatabase/tst_qsqldatabase.cpp
+++ b/tests/auto/qsqldatabase/tst_qsqldatabase.cpp
@@ -2493,7 +2493,6 @@ void tst_QSqlDatabase::oci_tables()
     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()));
 }
 
diff --git a/tests/benchmarks/qscriptengine/tst_qscriptengine.cpp b/tests/benchmarks/qscriptengine/tst_qscriptengine.cpp
index 8d5f6e6..1c787e9 100644
--- a/tests/benchmarks/qscriptengine/tst_qscriptengine.cpp
+++ b/tests/benchmarks/qscriptengine/tst_qscriptengine.cpp
@@ -72,6 +72,8 @@ private slots:
     void toStringHandle();
     void castValueToQreal();
     void nativeCall();
+    void translation_data();
+    void translation();
 };
 
 tst_QScriptEngine::tst_QScriptEngine()
@@ -259,5 +261,24 @@ void tst_QScriptEngine::nativeCall()
     }
 }
 
+void tst_QScriptEngine::translation_data()
+{
+    QTest::addColumn<QString>("text");
+    QTest::newRow("no translation") << "\"hello world\"";
+    QTest::newRow("qsTr") << "qsTr(\"hello world\")";
+    QTest::newRow("qsTranslate") << "qsTranslate(\"\", \"hello world\")";
+}
+
+void tst_QScriptEngine::translation()
+{
+    QFETCH(QString, text);
+    QScriptEngine engine;
+    engine.installTranslatorFunctions();
+
+    QBENCHMARK {
+        (void)engine.evaluate(text);
+    }
+}
+
 QTEST_MAIN(tst_QScriptEngine)
 #include "tst_qscriptengine.moc"