summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Klokkhammer Helsing <johan.helsing@qt.io>2019-10-01 15:33:50 +0200
committerJohan Klokkhammer Helsing <johan.helsing@qt.io>2019-10-01 15:33:50 +0200
commitddf5e26fdb6f334bef807879543d760123bf220a (patch)
tree38d635d44e312abdefde475322c213967db78e11
parent186ccec24e0974dea7cd72badf404f53816092e0 (diff)
parent5189d6316fc84c098e26e9dfa877d73d7f090287 (diff)
Merge remote-tracking branch 'origin/5.15' into dev
-rw-r--r--src/client/qwaylandinputdevice.cpp13
-rw-r--r--src/plugins/hardwareintegration/compositor/dmabuf-server/dmabuf-server.pro2
-rw-r--r--src/plugins/hardwareintegration/compositor/drm-egl-server/drm-egl-server.pro2
-rw-r--r--src/plugins/hardwareintegration/compositor/hardwarelayer/vsp2/vsp2.pro2
-rw-r--r--src/plugins/hardwareintegration/compositor/libhybris-egl-server/libhybris-egl-server.pro2
-rw-r--r--src/plugins/hardwareintegration/compositor/shm-emulation-server/shm-emulation-server.pro2
-rw-r--r--src/plugins/hardwareintegration/compositor/vulkan-server/vulkan-server.pro2
-rw-r--r--sync.profile4
-rw-r--r--tests/auto/client/fullscreenshellv1/fullscreenshellv1.pro2
-rw-r--r--tests/auto/compositor/compositor/mockclient.h1
10 files changed, 20 insertions, 12 deletions
diff --git a/src/client/qwaylandinputdevice.cpp b/src/client/qwaylandinputdevice.cpp
index e39ccf25..a9da452d 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/src/plugins/hardwareintegration/compositor/dmabuf-server/dmabuf-server.pro b/src/plugins/hardwareintegration/compositor/dmabuf-server/dmabuf-server.pro
index 5771d570..d96e5813 100644
--- a/src/plugins/hardwareintegration/compositor/dmabuf-server/dmabuf-server.pro
+++ b/src/plugins/hardwareintegration/compositor/dmabuf-server/dmabuf-server.pro
@@ -7,7 +7,7 @@ SOURCES += \
TARGET = qt-wayland-compositor-dmabuf-server-buffer
-include($PWD/../../../../../hardwareintegration/compositor/dmabuf-server/dmabuf-server.pri)
+include(../../../../hardwareintegration/compositor/dmabuf-server/dmabuf-server.pri)
PLUGIN_TYPE = wayland-graphics-integration-server
PLUGIN_CLASS_NAME = DmaBufServerBufferIntegrationPlugin
diff --git a/src/plugins/hardwareintegration/compositor/drm-egl-server/drm-egl-server.pro b/src/plugins/hardwareintegration/compositor/drm-egl-server/drm-egl-server.pro
index aeaa54c4..2ba17c38 100644
--- a/src/plugins/hardwareintegration/compositor/drm-egl-server/drm-egl-server.pro
+++ b/src/plugins/hardwareintegration/compositor/drm-egl-server/drm-egl-server.pro
@@ -7,7 +7,7 @@ SOURCES += \
TARGET = qt-wayland-compositor-drm-egl-server-buffer
-include($PWD/../../../../../hardwareintegration/compositor/drm-egl-server/drm-egl-server.pri)
+include(../../../../hardwareintegration/compositor/drm-egl-server/drm-egl-server.pri)
PLUGIN_TYPE = wayland-graphics-integration-server
PLUGIN_CLASS_NAME = DrmEglServerBufferIntegrationPlugin
diff --git a/src/plugins/hardwareintegration/compositor/hardwarelayer/vsp2/vsp2.pro b/src/plugins/hardwareintegration/compositor/hardwarelayer/vsp2/vsp2.pro
index 1c21f04e..c18884a9 100644
--- a/src/plugins/hardwareintegration/compositor/hardwarelayer/vsp2/vsp2.pro
+++ b/src/plugins/hardwareintegration/compositor/hardwarelayer/vsp2/vsp2.pro
@@ -9,7 +9,7 @@ SOURCES += \
TARGET = qt-wayland-compositor-vsp2
-include($PWD/../../../../../../hardwareintegration/compositor/hardwarelayer/vsp2/vsp2.pri)
+include(../../../../../hardwareintegration/compositor/hardwarelayer/vsp2/vsp2.pri)
PLUGIN_TYPE = wayland-hardware-layer-integration
PLUGIN_CLASS_NAME = Vsp2HardwareLayerIntegrationPlugin
diff --git a/src/plugins/hardwareintegration/compositor/libhybris-egl-server/libhybris-egl-server.pro b/src/plugins/hardwareintegration/compositor/libhybris-egl-server/libhybris-egl-server.pro
index 84dc6e01..c9c3a0da 100644
--- a/src/plugins/hardwareintegration/compositor/libhybris-egl-server/libhybris-egl-server.pro
+++ b/src/plugins/hardwareintegration/compositor/libhybris-egl-server/libhybris-egl-server.pro
@@ -7,7 +7,7 @@ SOURCES += \
TARGET = qt-wayland-compositor-libybris-egl-server.json
-include($PWD/../../../../../hardwareintegration/compositor/libhybris-egl-server/libhybris-egl-server.pri)
+include(../../../../hardwareintegration/compositor/libhybris-egl-server/libhybris-egl-server.pri)
PLUGIN_TYPE = wayland-graphics-integration-server
PLUGIN_CLASS_NAME = LibHybrisEglServerBufferIntegrationPlugin
diff --git a/src/plugins/hardwareintegration/compositor/shm-emulation-server/shm-emulation-server.pro b/src/plugins/hardwareintegration/compositor/shm-emulation-server/shm-emulation-server.pro
index 67026e47..865af1a7 100644
--- a/src/plugins/hardwareintegration/compositor/shm-emulation-server/shm-emulation-server.pro
+++ b/src/plugins/hardwareintegration/compositor/shm-emulation-server/shm-emulation-server.pro
@@ -7,7 +7,7 @@ SOURCES += \
TARGET = qt-wayland-compositor-shm-emulation-server
-include($PWD/../../../../../hardwareintegration/compositor/shm-emulation-server/shm-emulation-server.pri)
+include(../../../../hardwareintegration/compositor/shm-emulation-server/shm-emulation-server.pri)
PLUGIN_TYPE = wayland-graphics-integration-server
PLUGIN_CLASS_NAME = ShmServerBufferIntegrationPlugin
diff --git a/src/plugins/hardwareintegration/compositor/vulkan-server/vulkan-server.pro b/src/plugins/hardwareintegration/compositor/vulkan-server/vulkan-server.pro
index 28d3a585..dc82c3f2 100644
--- a/src/plugins/hardwareintegration/compositor/vulkan-server/vulkan-server.pro
+++ b/src/plugins/hardwareintegration/compositor/vulkan-server/vulkan-server.pro
@@ -7,7 +7,7 @@ SOURCES += \
TARGET = qt-wayland-compositor-vulkan-server
-include($PWD/../../../../../hardwareintegration/compositor/vulkan-server/vulkan-server.pri)
+include(../../../../hardwareintegration/compositor/vulkan-server/vulkan-server.pri)
PLUGIN_TYPE = wayland-graphics-integration-server
PLUGIN_CLASS_NAME = VulkanServerBufferIntegrationPlugin
diff --git a/sync.profile b/sync.profile
index 5c7ada91..57221345 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 49d19d5c..c4006cdd 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 69a0e47c..89d0a0b3 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"