diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-01 03:02:15 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-01 03:02:15 +0200 |
| commit | 79fb1089474514dbe1b25004df126d3194c952a8 (patch) | |
| tree | 2cd05c05beffaa02a592c43b92b43dfca75b6db8 | |
| parent | 91ed3e7c5800a6ef4bea9d0c4d80196f94caec95 (diff) | |
| parent | 03e160cfd286bb336e875a180efd83635be7a27f (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Ib52352036df229b4047d0c19f713ae2436741993
| -rw-r--r-- | src/client/qwaylandinputdevice.cpp | 13 | ||||
| -rw-r--r-- | sync.profile | 4 | ||||
| -rw-r--r-- | tests/auto/client/fullscreenshellv1/fullscreenshellv1.pro | 2 | ||||
| -rw-r--r-- | tests/auto/compositor/compositor/mockclient.h | 1 |
4 files changed, 14 insertions, 6 deletions
diff --git a/src/client/qwaylandinputdevice.cpp b/src/client/qwaylandinputdevice.cpp index e39ccf25e..a9da452dc 100644 --- a/src/client/qwaylandinputdevice.cpp +++ b/src/client/qwaylandinputdevice.cpp @@ -1158,7 +1158,18 @@ void QWaylandInputDevice::Keyboard::handleKey(ulong timestamp, QEvent::Type type } if (!filtered) { - QWindowSystemInterface::handleExtendedKeyEvent(focusWindow()->window(), timestamp, type, key, modifiers, + auto window = focusWindow()->window(); + + if (type == QEvent::KeyPress && key == Qt::Key_Menu) { + auto cursor = window->screen()->handle()->cursor(); + if (cursor) { + const QPoint globalPos = cursor->pos(); + const QPoint pos = window->mapFromGlobal(globalPos); + QWindowSystemInterface::handleContextMenuEvent(window, false, pos, globalPos, modifiers); + } + } + + QWindowSystemInterface::handleExtendedKeyEvent(window, timestamp, type, key, modifiers, nativeScanCode, nativeVirtualKey, nativeModifiers, text, autorepeat, count); } } diff --git a/sync.profile b/sync.profile index 5c7ada912..572213457 100644 --- a/sync.profile +++ b/sync.profile @@ -46,10 +46,6 @@ "^wayland-xdg-shell-client-protocol.h", "^wayland-xdg-decoration-unstable-v1-client-protocol.h", ], - "$basedir/src/plugins/shellintegration/xdg-shell-v5" => [ - "^qwayland-xdg-shell-unstable-v5.h", - "^wayland-xdg-shell-unstable-v5-client-protocol.h", - ], "$basedir/src/plugins/shellintegration/xdg-shell-v6" => [ "^qwayland-xdg-shell-unstable-v6.h", "^wayland-xdg-shell-unstable-v6-client-protocol.h", diff --git a/tests/auto/client/fullscreenshellv1/fullscreenshellv1.pro b/tests/auto/client/fullscreenshellv1/fullscreenshellv1.pro index 49d19d5c3..c4006cdd8 100644 --- a/tests/auto/client/fullscreenshellv1/fullscreenshellv1.pro +++ b/tests/auto/client/fullscreenshellv1/fullscreenshellv1.pro @@ -1,4 +1,4 @@ include (../shared_old/shared_old.pri) -TARGET = tst_client_fullscreenshell1 +TARGET = tst_client_fullscreenshellv1 SOURCES += tst_fullscreenshellv1.cpp diff --git a/tests/auto/compositor/compositor/mockclient.h b/tests/auto/compositor/compositor/mockclient.h index 69a0e47cf..89d0a0b3f 100644 --- a/tests/auto/compositor/compositor/mockclient.h +++ b/tests/auto/compositor/compositor/mockclient.h @@ -36,6 +36,7 @@ #include <QImage> #include <QRect> #include <QList> +#include <QtCore/QMap> #include <QWaylandOutputMode> #include "mockxdgoutputv1.h" |