diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-31 20:09:14 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-01 06:02:55 +0100 |
| commit | a732576a66ff2bbd9c0b41cd5f3505a4d2fbf043 (patch) | |
| tree | d09875c3543ad837fbfaaf10bd4eef1d3de42941 /src/plugins/sqldrivers/db2/qsql_db2.cpp | |
| parent | cd9de59177ccbeb7fdfacf8716af7bb20112c880 (diff) | |
| parent | 8e20daae9fee5f3b999daffce0d7156015ee974b (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
config.tests/win/msvc_version.cpp
configure.pri
mkspecs/macx-ios-clang/features/default_post.prf
mkspecs/macx-ios-clang/features/resolve_config.prf
mkspecs/features/uikit/default_post.prf
mkspecs/features/uikit/resolve_config.prf
src/corelib/io/qsettings_mac.cpp
src/corelib/json/qjsondocument.cpp
src/plugins/platforms/cocoa/qcocoawindow.h
src/plugins/platforms/cocoa/qcocoawindow.mm
src/plugins/platforms/cocoa/qnswindowdelegate.h
src/plugins/platforms/cocoa/qnswindowdelegate.mm
src/plugins/platforms/ios/ios.pro
src/plugins/platforms/ios/kernel.pro
src/plugins/platforms/ios/qiosintegration.h
src/plugins/platforms/minimalegl/qminimaleglintegration.cpp
tests/auto/gui/painting/qpainter/tst_qpainter.cpp
tools/configure/environment.cpp
Change-Id: I654845e54e40f5951fb78aab349ca667e9f27843
Diffstat (limited to 'src/plugins/sqldrivers/db2/qsql_db2.cpp')
| -rw-r--r-- | src/plugins/sqldrivers/db2/qsql_db2.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/plugins/sqldrivers/db2/qsql_db2.cpp b/src/plugins/sqldrivers/db2/qsql_db2.cpp index 9408f464e0..27d0e7001a 100644 --- a/src/plugins/sqldrivers/db2/qsql_db2.cpp +++ b/src/plugins/sqldrivers/db2/qsql_db2.cpp @@ -59,8 +59,6 @@ #define SQL_BIGUINT_TYPE quint64 #endif -#define UNICODE - #include <sqlcli1.h> #include <string.h> @@ -1187,8 +1185,8 @@ QDB2Driver::QDB2Driver(Qt::HANDLE env, Qt::HANDLE con, QObject* parent) : QSqlDriver(*new QDB2DriverPrivate, parent) { Q_D(QDB2Driver); - d->hEnv = reinterpret_cast<intptr_t>(env); - d->hDbc = reinterpret_cast<intptr_t>(con); + d->hEnv = reinterpret_cast<SQLHANDLE>(env); + d->hDbc = reinterpret_cast<SQLHANDLE>(con); if (env && con) { setOpen(true); setOpenError(false); |