diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-01 03:03:20 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-01 03:03:20 +0100 |
commit | e68ba96a65b487e8468798e616421f69a2c04f9a (patch) | |
tree | 54f8d65bc6235596223b8a738865faedd23a0e73 | |
parent | 81c239d8c08346c2e540f54f7988c8c1bc9bdfec (diff) | |
parent | deed419755f3ed8409ba0cf784695ca7a3a6063a (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I064b614b3390d9b744afb3ac437096109b53b1d5
-rw-r--r-- | dist/changes-5.14.1 | 34 | ||||
-rw-r--r-- | src/client/qwaylandwindow_p.h | 2 | ||||
-rw-r--r-- | src/compositor/compositor_api/qwaylandcompositor.cpp | 9 |
3 files changed, 44 insertions, 1 deletions
diff --git a/dist/changes-5.14.1 b/dist/changes-5.14.1 new file mode 100644 index 000000000..0da0c1ba6 --- /dev/null +++ b/dist/changes-5.14.1 @@ -0,0 +1,34 @@ +Qt 5.14.1 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.14.0. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +https://doc.qt.io/qt-5/index.html + +The Qt version 5.14 series is binary compatible with the 5.13.x series. +Applications compiled for 5.13 will continue to run with 5.14. + +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. + +**************************************************************************** +* QPA plugin * +**************************************************************************** + + - Fixed a crash when re-showing a popup after hiding its parent. + - Fixed keyboard repeat rate being set inversely, so higher rates would + actually result in fewer characters per second, and vice versa. + - Fixed a performance issue due to animated cursors updating too often. + - Fixed a compile error. + +**************************************************************************** +* Compositor * +**************************************************************************** + + - Fixed the linux-dmabuf plugins not being built on some systems. diff --git a/src/client/qwaylandwindow_p.h b/src/client/qwaylandwindow_p.h index 35fa1fdfc..c0328996d 100644 --- a/src/client/qwaylandwindow_p.h +++ b/src/client/qwaylandwindow_p.h @@ -196,7 +196,7 @@ public: void propagateSizeHints() override; void addAttachOffset(const QPoint point); - bool startSystemMove(const QPoint &pos) override; + bool startSystemMove(const QPoint &pos); void timerEvent(QTimerEvent *event) override; void requestUpdate() override; diff --git a/src/compositor/compositor_api/qwaylandcompositor.cpp b/src/compositor/compositor_api/qwaylandcompositor.cpp index e6402007e..83833991f 100644 --- a/src/compositor/compositor_api/qwaylandcompositor.cpp +++ b/src/compositor/compositor_api/qwaylandcompositor.cpp @@ -114,6 +114,15 @@ public: QWaylandKeyboardPrivate *keyb = QWaylandKeyboardPrivate::get(seat->keyboard()); +#if defined(Q_OS_QNX) + // The QNX platform plugin delivers scan codes that haven't been adjusted to be + // xkbcommon compatible. xkbcommon requires that the scan codes be bumped up by + // 8 because that's how evdev/XKB deliver scan codes. You might think that it + // would've been better to remove this (odd) requirement from xkbcommon on QNX + // but it turns out that conforming to it has much less impact. + static int offset = QGuiApplication::platformName() == QStringLiteral("qnx") ? 8 : 0; + ke->nativeScanCode += offset; +#endif uint32_t code = ke->nativeScanCode; bool isDown = ke->keyType == QEvent::KeyPress; |