Merge remote-tracking branch 'origin/dev' into wip/cmake

Change-Id: Ia76896a4d06240ccc3d95ba478b6ce273c7a0be2

9 files changed, 1 insertions, 12 deletions

diff --git a/examples/wayland/minimal-qml/main.qml b/examples/wayland/minimal-qml/main.qml
index 63ed9da5f..61cb6c9ef 100644
--- a/examples/wayland/minimal-qml/main.qml
+++ b/examples/wayland/minimal-qml/main.qml
@@ -67,7 +67,6 @@ WaylandCompositor {
                 // resize/move, and forwarding of mouse and keyboard
                 // events to the client process.
                 ShellSurfaceItem {
-                    autoCreatePopupItems: true
                     shellSurface: modelData
                     onSurfaceDestroyed: shellSurfaces.remove(index)
                 }
diff --git a/examples/wayland/multi-output/qml/GridScreen.qml b/examples/wayland/multi-output/qml/GridScreen.qml
index a59cb8fb4..252d66b12 100644
--- a/examples/wayland/multi-output/qml/GridScreen.qml
+++ b/examples/wayland/multi-output/qml/GridScreen.qml
@@ -82,7 +82,6 @@ WaylandOutput {
                     surface: gridSurface
                     width: gridView.cellWidth
                     height: gridView.cellHeight
-                    sizeFollowsSurface: false
                     inputEventsEnabled: false
                     allowDiscardFrontBuffer: true
                     MouseArea {
diff --git a/examples/wayland/multi-screen/qml/Chrome.qml b/examples/wayland/multi-screen/qml/Chrome.qml
index 52f449468..99141ad25 100644
--- a/examples/wayland/multi-screen/qml/Chrome.qml
+++ b/examples/wayland/multi-screen/qml/Chrome.qml
@@ -63,7 +63,6 @@ Item {
 
     ShellSurfaceItem {
         id: surfaceItem
-        autoCreatePopupItems: true
         onSurfaceDestroyed: chrome.destroy();
     }
 
diff --git a/examples/wayland/overview-compositor/main.qml b/examples/wayland/overview-compositor/main.qml
index d0482a90e..3785a7ed0 100644
--- a/examples/wayland/overview-compositor/main.qml
+++ b/examples/wayland/overview-compositor/main.qml
@@ -99,8 +99,6 @@ WaylandCompositor {
                         ShellSurfaceItem {
                             anchors.fill: parent
                             shellSurface: xdgSurface
-                            autoCreatePopupItems: true
-                            sizeFollowsSurface: false
                             onSurfaceDestroyed: toplevels.remove(index)
                         }
                         MouseArea {
diff --git a/examples/wayland/pure-qml/qml/Chrome.qml b/examples/wayland/pure-qml/qml/Chrome.qml
index a63ee705c..6e3270961 100644
--- a/examples/wayland/pure-qml/qml/Chrome.qml
+++ b/examples/wayland/pure-qml/qml/Chrome.qml
@@ -58,9 +58,6 @@ ShellSurfaceItem {
 
     signal destroyAnimationFinished
 
-    // If the client asks to show popups on this surface, automatically create child ShellSurfaceItems
-    autoCreatePopupItems: true
-
     onSurfaceDestroyed: {
         bufferLocked = true;
         destroyAnimation.start();
diff --git a/examples/wayland/server-buffer/cpp-client/cpp-client.pro b/examples/wayland/server-buffer/cpp-client/cpp-client.pro
index 45b71577b..6ac551323 100644
--- a/examples/wayland/server-buffer/cpp-client/cpp-client.pro
+++ b/examples/wayland/server-buffer/cpp-client/cpp-client.pro
@@ -1,4 +1,4 @@
-QT += waylandclient-private gui-private
+QT += waylandclient-private gui-private opengl
 CONFIG += wayland-scanner
 
 WAYLANDCLIENTSOURCES += ../share-buffer.xml
diff --git a/examples/wayland/server-side-decoration/main.qml b/examples/wayland/server-side-decoration/main.qml
index 5847ce411..4639ddcfd 100644
--- a/examples/wayland/server-side-decoration/main.qml
+++ b/examples/wayland/server-side-decoration/main.qml
@@ -96,7 +96,6 @@ WaylandCompositor {
                     ShellSurfaceItem {
                         id: shellSurfaceItem
                         moveItem: parent
-                        autoCreatePopupItems: true
                         shellSurface: modelData
                         onSurfaceDestroyed: shellSurfaces.remove(index)
                     }
diff --git a/examples/wayland/spanning-screens/main.qml b/examples/wayland/spanning-screens/main.qml
index ab57306bb..a5abc9b01 100644
--- a/examples/wayland/spanning-screens/main.qml
+++ b/examples/wayland/spanning-screens/main.qml
@@ -100,7 +100,6 @@ WaylandCompositor {
     Component {
         id: chromeComponent
         ShellSurfaceItem {
-            autoCreatePopupItems: true
             onSurfaceDestroyed: destroy()
         }
     }
diff --git a/examples/wayland/texture-sharing/custom-compositor/qml/main.qml b/examples/wayland/texture-sharing/custom-compositor/qml/main.qml
index 16a412fcd..6a0b90c88 100644
--- a/examples/wayland/texture-sharing/custom-compositor/qml/main.qml
+++ b/examples/wayland/texture-sharing/custom-compositor/qml/main.qml
@@ -95,7 +95,6 @@ WaylandCompositor {
             Repeater {
                 model: shellSurfaces
                 ShellSurfaceItem {
-                    autoCreatePopupItems: true
                     shellSurface: modelData
                     onSurfaceDestroyed: shellSurfaces.remove(index)
                 }