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

Conflicts:
	src/compositor/extensions/qwaylandxdgshellintegration.cpp

Change-Id: I3e8666d0c2fd047f12daeb94b2c967c646576ed9

5 files changed, 163 insertions, 0 deletions

diff --git a/examples/wayland/minimal-qml/main.cpp b/examples/wayland/minimal-qml/main.cpp
new file mode 100644
index 00000000..17e44b34
--- /dev/null
+++ b/examples/wayland/minimal-qml/main.cpp
@@ -0,0 +1,55 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtCore/QUrl>
+#include <QtCore/QDebug>
+
+#include <QtGui/QGuiApplication>
+
+#include <QtQml/QQmlApplicationEngine>
+
+int main(int argc, char *argv[])
+{
+    QGuiApplication app(argc, argv);
+
+    QQmlApplicationEngine appEngine(QUrl("qrc:///main.qml"));
+
+    return app.exec();
+}
diff --git a/examples/wayland/minimal-qml/main.qml b/examples/wayland/minimal-qml/main.qml
new file mode 100644
index 00000000..90d2fd4a
--- /dev/null
+++ b/examples/wayland/minimal-qml/main.qml
@@ -0,0 +1,88 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.6
+import QtQuick.Window 2.2
+import QtWayland.Compositor 1.0
+
+WaylandCompositor {
+    id: wlcompositor
+    // The output defines the screen.
+    WaylandOutput {
+        compositor: wlcompositor
+        window: Window {
+            width: 1024
+            height: 768
+            visible: true
+            WaylandMouseTracker {
+                anchors.fill: parent
+                enableWSCursor: true
+                Rectangle {
+                    id: surfaceArea
+                    color: "#1337af"
+                    anchors.fill: parent
+                }
+            }
+        }
+    }
+    // The chrome defines the window look and behavior.
+    // Here we use the built-in ShellSurfaceItem.
+    Component {
+        id: chromeComponent
+        ShellSurfaceItem {
+            onSurfaceDestroyed: destroy()
+        }
+    }
+    // Extensions are additions to the core Wayland
+    // protocol. We choose to support two different
+    // shells (window management protocols). When the
+    // client creates a new window, we instantiate a
+    // chromeComponent on the output.
+    extensions: [
+        WlShell {
+            onShellSurfaceCreated:
+                chromeComponent.createObject(surfaceArea, { "shellSurface": shellSurface } );
+        },
+        XdgShell {
+            onXdgSurfaceCreated:
+                chromeComponent.createObject(surfaceArea, { "shellSurface": xdgSurface } );
+        }
+    ]
+}
diff --git a/examples/wayland/minimal-qml/minimal-qml.pro b/examples/wayland/minimal-qml/minimal-qml.pro
new file mode 100644
index 00000000..a0c4f4ad
--- /dev/null
+++ b/examples/wayland/minimal-qml/minimal-qml.pro
@@ -0,0 +1,14 @@
+QT += gui qml
+
+SOURCES += \
+    main.cpp
+
+OTHER_FILES = \
+    main.qml
+
+RESOURCES += minimal-qml.qrc
+
+target.path = $$[QT_INSTALL_EXAMPLES]/wayland/minimal-qml
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS minimal-qml.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/wayland/minimal-qml
+INSTALLS += target sources
diff --git a/examples/wayland/minimal-qml/minimal-qml.qrc b/examples/wayland/minimal-qml/minimal-qml.qrc
new file mode 100644
index 00000000..5f6483ac
--- /dev/null
+++ b/examples/wayland/minimal-qml/minimal-qml.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/">
+        <file>main.qml</file>
+    </qresource>
+</RCC>
diff --git a/examples/wayland/wayland.pro b/examples/wayland/wayland.pro
index b67d12eb..503190c8 100644
--- a/examples/wayland/wayland.pro
+++ b/examples/wayland/wayland.pro
@@ -4,6 +4,7 @@ SUBDIRS += qwindow-compositor
 SUBDIRS += minimal-cpp
 
 qtHaveModule(quick) {
+    SUBDIRS += minimal-qml
     SUBDIRS += pure-qml
     SUBDIRS += multi-output
     SUBDIRS += custom-extension