Changeset 846 for trunk/src/sql/drivers/db2/qsql_db2.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/sql/drivers/db2/qsql_db2.cpp (modified) (3 diffs)

trunk/src/sql/drivers/db2/qsql_db2.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -110 +110 @@
 static QString qFromTChar(SQLTCHAR* str)
 {
-    return QString::fromUtf16(str);
+    return QStringstr);
 }
 
@@ -834 +834 @@
             case QVariant::String:
                 if (bindValueType(i) & QSql::Out)
-                    values[i] = QString::fromUtf16((ushort*)tmpStorage.takeFirst().constData());
+                    values[i] = QString*)tmpStorage.takeFirst().constData());
                 break;
             default: {