Merge remote-tracking branch 'origin/5.10' into dev

Change-Id: If69178e53ede77032d1a1e298e416fd69dd053f4

2 files changed, 2 insertions, 3 deletions

diff --git a/examples/wayland/minimal-cpp/window.cpp b/examples/wayland/minimal-cpp/window.cpp
index a23bba3ae..a66a33d58 100644
--- a/examples/wayland/minimal-cpp/window.cpp
+++ b/examples/wayland/minimal-cpp/window.cpp
@@ -75,7 +75,7 @@ static int sillyrandom(int range)
 {
     if (range <= 0)
         range = 200;
-    return QRandomGenerator::bounded(range);
+    return QRandomGenerator::global()->bounded(range);
 }
 
 void Window::paintGL()
diff --git a/examples/wayland/pure-qml/qml/main.qml b/examples/wayland/pure-qml/qml/main.qml
index 9ed4acd24..77ed3ecd9 100644
--- a/examples/wayland/pure-qml/qml/main.qml
+++ b/examples/wayland/pure-qml/qml/main.qml
@@ -104,9 +104,8 @@ WaylandCompositor {
         }
         onPopupCreated: {
             var parentView = viewsBySurface[popup.parentXdgSurface.surface];
-            var item = chromeComponent.createObject(defaultOutput.surfaceArea, { "shellSurface": xdgSurface } );
+            var item = chromeComponent.createObject(parentView, { "shellSurface": xdgSurface } );
             viewsBySurface[xdgSurface.surface] = item;
-            //TODO: set popup position
         }
     }