diff options
author | Liang Qi <liang.qi@qt.io> | 2017-11-20 13:18:32 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-11-20 13:18:32 +0100 |
commit | 62abd51e9528f5710918d94b75647704b5edd445 (patch) | |
tree | 148912c503889901552049d36a878f9daff5868b /examples | |
parent | ebd287f673609d52602ef8e6287f392d85b29f14 (diff) | |
parent | 00390ccf893aa02c8f51e0887624455c7e8d111d (diff) |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: If69178e53ede77032d1a1e298e416fd69dd053f4
Diffstat (limited to 'examples')
-rw-r--r-- | examples/wayland/minimal-cpp/window.cpp | 2 | ||||
-rw-r--r-- | examples/wayland/pure-qml/qml/main.qml | 3 |
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 } } |