diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-02-22 09:00:29 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-02-22 09:00:29 (GMT) |
| commit | 6d23a6d0a2954a4895dd5c1cfade28eab5a2874e (patch) | |
| tree | f2f1709febef96b8eec5fcf5f450abe50759a4c7 /src/sql/drivers/db2/qsql_db2.cpp | |
| parent | 746be2ba8d54e2c9803af6a6ba3cc0b6bf1da258 (diff) | |
| parent | e2f90ecdde9550986df1539aa88eb5fc41d939e1 (diff) | |
| download | Qt-6d23a6d0a2954a4895dd5c1cfade28eab5a2874e.zip Qt-6d23a6d0a2954a4895dd5c1cfade28eab5a2874e.tar.gz Qt-6d23a6d0a2954a4895dd5c1cfade28eab5a2874e.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Diffstat (limited to 'src/sql/drivers/db2/qsql_db2.cpp')
| -rw-r--r-- | src/sql/drivers/db2/qsql_db2.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sql/drivers/db2/qsql_db2.cpp b/src/sql/drivers/db2/qsql_db2.cpp index d5b3984..ea0b42e 100644 --- a/src/sql/drivers/db2/qsql_db2.cpp +++ b/src/sql/drivers/db2/qsql_db2.cpp @@ -109,7 +109,7 @@ public: static QString qFromTChar(SQLTCHAR* str) { - return QString::fromUtf16(str); + return QString((const QChar *)str); } // dangerous!! (but fast). Don't use in functions that @@ -833,7 +833,7 @@ bool QDB2Result::exec() break; case QVariant::String: if (bindValueType(i) & QSql::Out) - values[i] = QString::fromUtf16((ushort*)tmpStorage.takeFirst().constData()); + values[i] = QString((const QChar *)tmpStorage.takeFirst().constData()); break; default: { values[i] = QString::fromAscii(tmpStorage.takeFirst().constData()); |