OSDN Git Service

fix build of odbc driver when UNICODE is not defined
authorIvailo Monev <xakepa10@laimg.moc>
Sat, 12 Nov 2016 18:18:19 +0000 (18:18 +0000)
committerIvailo Monev <xakepa10@laimg.moc>
Sat, 12 Nov 2016 18:18:19 +0000 (18:18 +0000)
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
src/plugins/sqldrivers/odbc/qsql_odbc.cpp

index 94d3f08..614a938 100644 (file)
@@ -42,9 +42,6 @@
 #include "qsql_odbc.h"
 #include <qsqlrecord.h>
 
-#if defined (Q_OS_WIN32)
-#include <qt_windows.h>
-#endif
 #include <qcoreapplication.h>
 #include <qvariant.h>
 #include <qdatetime.h>
@@ -1945,8 +1942,8 @@ void QODBCDriverPrivate::checkUnicode()
     if(r == SQL_SUCCESS) {
         r = SQLFetch(hStmt);
         if(r == SQL_SUCCESS) {
-            QVarLengthArray<SQLWCHAR> buffer(10);
-            r = SQLGetData(hStmt, 1, SQL_C_WCHAR, buffer.data(), buffer.size() * sizeof(SQLWCHAR), NULL);
+            QVarLengthArray<SQLTCHAR> buffer(10);
+            r = SQLGetData(hStmt, 1, SQL_C_TCHAR, buffer.data(), buffer.size() * sizeof(SQLTCHAR), NULL);
             if(r == SQL_SUCCESS && fromSQLTCHAR(buffer) == QLatin1String("test")) {
                 unicode = true;
             }