diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-03-30 14:56:41 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-03-30 14:56:41 (GMT) |
| commit | 87f66d52e362de003a9f2cdaafbfbe3ba4e5fbc3 (patch) | |
| tree | f8b8c24056d54e19937dea1b0301af558597726a /src/sql/drivers/db2/qsql_db2.cpp | |
| parent | 09ce407aaa4a00013a606bf0011faf6cbc654c72 (diff) | |
| parent | 00f7426f3906361fb5addb36e428648eee5e2983 (diff) | |
| download | Qt-87f66d52e362de003a9f2cdaafbfbe3ba4e5fbc3.zip Qt-87f66d52e362de003a9f2cdaafbfbe3ba4e5fbc3.tar.gz Qt-87f66d52e362de003a9f2cdaafbfbe3ba4e5fbc3.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Conflicts:
doc/src/modules.qdoc
mkspecs/common/symbian/symbian.conf
src/gui/graphicsview/qgraphicswidget.h
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
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()); |