Merge remote-tracking branch 'qt/5.8' into 5.9

Change-Id: I43cd0147a63b5523e3112f09bbfe60e1d6636e6c

5 files changed, 10 insertions, 5 deletions

diff --git a/src/compositor/compositor_api/qwaylandquickitem.cpp b/src/compositor/compositor_api/qwaylandquickitem.cpp
index ee9fa5427..a39eff9e8 100644
--- a/src/compositor/compositor_api/qwaylandquickitem.cpp
+++ b/src/compositor/compositor_api/qwaylandquickitem.cpp
@@ -678,8 +678,11 @@ void QWaylandQuickItem::touchEvent(QTouchEvent *event)
 void QWaylandQuickItem::touchUngrabEvent()
 {
     Q_D(QWaylandQuickItem);
-    for (auto seat : d->touchingSeats)
-        seat->sendTouchCancelEvent(surface()->client());
+
+    if (d->shouldSendInputEvents())
+        for (auto seat : d->touchingSeats)
+            seat->sendTouchCancelEvent(surface()->client());
+
     d->touchingSeats.clear();
 }
 
diff --git a/src/compositor/configure.json b/src/compositor/configure.json
index 2ddccd98d..52365fe37 100644
--- a/src/compositor/configure.json
+++ b/src/compositor/configure.json
@@ -67,7 +67,7 @@
             "output": [ "privateFeature" ]
         },
         "wayland-brcm": {
-            "label": "Rasberry Pi",
+            "label": "Raspberry Pi",
             "condition": "features.wayland-server && features.eglfs_brcm",
             "output": [ "privateFeature" ]
         },
diff --git a/src/compositor/extensions/qwaylandquickshellsurfaceitem_p.h b/src/compositor/extensions/qwaylandquickshellsurfaceitem_p.h
index b9eb5ad62..4cd1ebb77 100644
--- a/src/compositor/extensions/qwaylandquickshellsurfaceitem_p.h
+++ b/src/compositor/extensions/qwaylandquickshellsurfaceitem_p.h
@@ -72,7 +72,7 @@ public:
     QQuickItem *m_moveItem;
 };
 
-class QWaylandQuickShellIntegration : public QObject
+class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandQuickShellIntegration : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/compositor/extensions/qwaylandxdgshellv5.cpp b/src/compositor/extensions/qwaylandxdgshellv5.cpp
index 80aa52e70..82171c40b 100644
--- a/src/compositor/extensions/qwaylandxdgshellv5.cpp
+++ b/src/compositor/extensions/qwaylandxdgshellv5.cpp
@@ -1103,6 +1103,7 @@ void QWaylandXdgPopupV5::initialize(QWaylandXdgShellV5 *shell, QWaylandSurface *
     emit shellChanged();
     emit surfaceChanged();
     emit parentSurfaceChanged();
+    emit positionChanged();
     QWaylandCompositorExtension::initialize();
 }
 
diff --git a/src/compositor/extensions/qwaylandxdgshellv5.h b/src/compositor/extensions/qwaylandxdgshellv5.h
index 269ea8934..4adf0f9b8 100644
--- a/src/compositor/extensions/qwaylandxdgshellv5.h
+++ b/src/compositor/extensions/qwaylandxdgshellv5.h
@@ -212,7 +212,7 @@ class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandXdgPopupV5 : public QWaylandShellSurfa
     Q_PROPERTY(QWaylandXdgShellV5 *shell READ shell NOTIFY shellChanged)
     Q_PROPERTY(QWaylandSurface *surface READ surface NOTIFY surfaceChanged)
     Q_PROPERTY(QWaylandSurface *parentSurface READ parentSurface NOTIFY parentSurfaceChanged)
-    Q_PROPERTY(QPoint position READ position)
+    Q_PROPERTY(QPoint position READ position NOTIFY positionChanged)
 
 public:
     QWaylandXdgPopupV5();
@@ -245,6 +245,7 @@ Q_SIGNALS:
     void shellChanged();
     void surfaceChanged();
     void parentSurfaceChanged();
+    void positionChanged();
 
 private:
     void initialize() override;