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

* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
  revert to fromUtf16() usage in fromWCharArray()
  Assistant examples: Fix missing QLatin1String.
  Added Czech translations.
  Webkit: Fix missing namespace.
  qmake: subdirs template: make distclean target use QMAKE_DISTCLEAN
  qmake: fix warnings
  qmake: Remove macro and simplify string expression previously using it
  qmake: use isActiveConfig() instead of hand-crafting comparisons
  Fix missing namespace.
  Assistant: Fix spelling mistakes.
  Assistant: Use const references in foreach loops.
  optimization: get rid of QString::fromUtf16() usage
  document QString::fromUtf16() slowness
  remove duplicated calculation of length
  remove pointless conditionals
  micro-optimization
  optimize qhash()
  Designer/uic/related examples: Fix source code scanning issues II.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/sql/drivers/sqlite/qsql_sqlite.cpp b/src/sql/drivers/sqlite/qsql_sqlite.cpp
index 9dbefaf..9fff552 100644
--- a/src/sql/drivers/sqlite/qsql_sqlite.cpp
+++ b/src/sql/drivers/sqlite/qsql_sqlite.cpp
@@ -245,9 +245,9 @@ bool QSQLiteResultPrivate::fetchNext(QSqlCachedResult::ValueCache &values, int i
                 values[i + idx] = QVariant(QVariant::String);
                 break;
             default:
-                values[i + idx] = QString::fromUtf16(static_cast<const ushort *>(
+                values[i + idx] = QString(reinterpret_cast<const QChar *>(
                             sqlite3_column_text16(stmt, i)),
-                            sqlite3_column_bytes16(stmt, i) / sizeof(ushort));
+                            sqlite3_column_bytes16(stmt, i) / sizeof(QChar));
                 break;
             }
         }