diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-28 14:16:25 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-28 14:16:25 +0100 |
commit | c6602af186fa87848954dd653022c1f879a8ae7a (patch) | |
tree | 08b285128d1440efcc1ac2b0cd65702be02318fe | |
parent | a8de09c5da8e2743cd1ebf30b1048ca3d0dded6e (diff) | |
parent | d80236f50559f4fe785fba598a03aaa7f05d37ac (diff) | |
download | qtx11extras-c6602af186fa87848954dd653022c1f879a8ae7a.tar.gz |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I5abddc28efee08aaa909c509145279b1dd3a1035
-rw-r--r-- | dist/changes-5.10.1 | 26 | ||||
-rw-r--r-- | src/x11extras/qx11info_x11.cpp | 12 |
2 files changed, 32 insertions, 6 deletions
diff --git a/dist/changes-5.10.1 b/dist/changes-5.10.1 new file mode 100644 index 0000000..695c4e3 --- /dev/null +++ b/dist/changes-5.10.1 @@ -0,0 +1,26 @@ +Qt 5.10.1 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.10.0. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +http://doc.qt.io/qt-5/index.html + +The Qt version 5.10 series is binary compatible with the 5.9.x series. +Applications compiled for 5.9 will continue to run with 5.10. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +This release contains all fixes included in the Qt 5.9.4 release. + +**************************************************************************** +* Qt 5.10.1 Changes * +**************************************************************************** + + - This release contains only minor code improvements. diff --git a/src/x11extras/qx11info_x11.cpp b/src/x11extras/qx11info_x11.cpp index 9f5d8a2..f503509 100644 --- a/src/x11extras/qx11info_x11.cpp +++ b/src/x11extras/qx11info_x11.cpp @@ -250,7 +250,7 @@ void QX11Info::setAppTime(unsigned long time) return; typedef void (*SetAppTimeFunc)(QScreen *, xcb_timestamp_t); QScreen* screen = QGuiApplication::primaryScreen(); - SetAppTimeFunc func = reinterpret_cast<SetAppTimeFunc>(native->nativeResourceFunctionForScreen("setapptime")); + SetAppTimeFunc func = reinterpret_cast<SetAppTimeFunc>(reinterpret_cast<void *>(native->nativeResourceFunctionForScreen("setapptime"))); if (func) func(screen, time); else @@ -271,7 +271,7 @@ void QX11Info::setAppUserTime(unsigned long time) return; typedef void (*SetAppUserTimeFunc)(QScreen *, xcb_timestamp_t); QScreen* screen = QGuiApplication::primaryScreen(); - SetAppUserTimeFunc func = reinterpret_cast<SetAppUserTimeFunc>(native->nativeResourceFunctionForScreen("setappusertime")); + SetAppUserTimeFunc func = reinterpret_cast<SetAppUserTimeFunc>(reinterpret_cast<void *>(native->nativeResourceFunctionForScreen("setappusertime"))); if (func) func(screen, time); else @@ -337,7 +337,7 @@ void QX11Info::setNextStartupId(const QByteArray &id) if (!native) return; typedef void (*SetStartupIdFunc)(const char*); - SetStartupIdFunc func = reinterpret_cast<SetStartupIdFunc>(native->nativeResourceFunctionForIntegration("setstartupid")); + SetStartupIdFunc func = reinterpret_cast<SetStartupIdFunc>(reinterpret_cast<void *>(native->nativeResourceFunctionForIntegration("setstartupid"))); if (func) func(id.constData()); else @@ -423,7 +423,7 @@ qint32 QX11Info::generatePeekerId() typedef qint32 (*GeneratePeekerIdFunc)(void); GeneratePeekerIdFunc generatepeekerid = reinterpret_cast<GeneratePeekerIdFunc>( - native->nativeResourceFunctionForIntegration("generatepeekerid")); + reinterpret_cast<void *>(native->nativeResourceFunctionForIntegration("generatepeekerid"))); if (!generatepeekerid) { qWarning("Internal error: QPA plugin doesn't implement generatePeekerId"); return -1; @@ -451,7 +451,7 @@ bool QX11Info::removePeekerId(qint32 peekerId) typedef bool (*RemovePeekerIdFunc)(qint32); RemovePeekerIdFunc removePeekerId = reinterpret_cast<RemovePeekerIdFunc>( - native->nativeResourceFunctionForIntegration("removepeekerid")); + reinterpret_cast<void *>(native->nativeResourceFunctionForIntegration("removepeekerid"))); if (!removePeekerId) { qWarning("Internal error: QPA plugin doesn't implement removePeekerId"); return false; @@ -552,7 +552,7 @@ bool QX11Info::peekEventQueue(PeekerCallback peeker, void *peekerData, PeekOptio typedef bool (*PeekEventQueueFunc)(PeekerCallback, void *, PeekOptions, qint32); PeekEventQueueFunc peekeventqueue = reinterpret_cast<PeekEventQueueFunc>( - native->nativeResourceFunctionForIntegration("peekeventqueue")); + reinterpret_cast<void *>(native->nativeResourceFunctionForIntegration("peekeventqueue"))); if (!peekeventqueue) { qWarning("Internal error: QPA plugin doesn't implement peekEventQueue"); return false; |