diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-06-07 19:10:53 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-06-07 19:10:53 +0200 |
| commit | 096e37910d93f9c52976600e985c615ea36fe291 (patch) | |
| tree | 713d020f4a04f03d8ca6e111055e7eebe85953a8 /src/plugins/sqldrivers | |
| parent | 88eda007a3b5046999dd0b287634765efcd8934d (diff) | |
| parent | a14a943f9ac3d1e85514d7fb6688c84e624ac850 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
.qmake.conf
src/corelib/kernel/qeventdispatcher_cf.mm
src/gui/kernel/qguiapplication_p.h
src/gui/kernel/qwindowsysteminterface.cpp
src/gui/kernel/qwindowsysteminterface.h
src/plugins/platforms/cocoa/qcocoawindow.mm
src/plugins/platforms/cocoa/qnswindowdelegate.mm
src/plugins/platforms/ios/qioseventdispatcher.mm
src/plugins/platforms/windows/qwindowsdrag.h
src/plugins/platforms/windows/qwindowsinternalmimedata.h
src/plugins/platforms/windows/qwindowsmime.cpp
src/plugins/platforms/winrt/qwinrtscreen.cpp
Change-Id: Ic817f265c2386e83839d2bb9ef7419cb29705246
Diffstat (limited to 'src/plugins/sqldrivers')
| -rw-r--r-- | src/plugins/sqldrivers/ibase/qsql_ibase.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/sqldrivers/ibase/qsql_ibase.cpp b/src/plugins/sqldrivers/ibase/qsql_ibase.cpp index 6fbdef2695..484dad6e1d 100644 --- a/src/plugins/sqldrivers/ibase/qsql_ibase.cpp +++ b/src/plugins/sqldrivers/ibase/qsql_ibase.cpp @@ -1845,9 +1845,9 @@ bool QIBaseDriver::subscribeToNotification(const QString &name) eBuffer->bufferLength, eBuffer->eventBuffer, #if defined (FB_API_VER) && FB_API_VER >= 20 - (ISC_EVENT_CALLBACK)qEventCallback, + reinterpret_cast<ISC_EVENT_CALLBACK>(qEventCallback), #else - (isc_callback)qEventCallback, + reinterpret_cast<isc_callback>(qEventCallback), #endif eBuffer->resultBuffer); @@ -1925,9 +1925,9 @@ void QIBaseDriver::qHandleEventNotification(void *updatedResultBuffer) eBuffer->bufferLength, eBuffer->eventBuffer, #if defined (FB_API_VER) && FB_API_VER >= 20 - (ISC_EVENT_CALLBACK)qEventCallback, + reinterpret_cast<ISC_EVENT_CALLBACK>(qEventCallback), #else - (isc_callback)qEventCallback, + reinterpret_cast<isc_callback>(qEventCallback), #endif eBuffer->resultBuffer); if (Q_UNLIKELY(status[0] == 1 && status[1])) { |