From 3130cc4d86a5059a6cd7f44b72f1fc1338548c50 Mon Sep 17 00:00:00 2001
From: Giulio Camuffo <giulio.camuffo@jollamobile.com>
Date: Tue, 17 Feb 2015 16:33:43 +0200
Subject: [PATCH] Implement the wl_subcompositor interface server-side

This change removes the qt_sub_surface extension and replaces it with
the standard wl_subsurface.
Only the bare minimum functionality is implemented, the wl_subsurface
requests are left as dummy handlers currently.

Change-Id: I025304072cf157f732e90c4b5649a07b295fdea5
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
Reviewed-by: Mikko Levonmaa <mikko.levonmaa@bitfactor.fi>
---
 .../extensions/sub-surface-extension.xml      | 69 -------------------
 src/plugins/platforms/wayland/client.pro      |  1 -
 2 files changed, 70 deletions(-)
 delete mode 100644 src/3rdparty/wayland/extensions/sub-surface-extension.xml

diff --git a/src/3rdparty/wayland/extensions/sub-surface-extension.xml b/src/3rdparty/wayland/extensions/sub-surface-extension.xml
deleted file mode 100644
index 4ea87e20319..00000000000
--- a/src/3rdparty/wayland/extensions/sub-surface-extension.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<protocol name="sub_surface_extension">
-
-    <copyright>
- Copyright (C) 2015 The Qt Company Ltd.
- Contact: http://www.qt.io/licensing/
-
- This file is part of the plugins 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$
-    </copyright>
-
-    <interface name="qt_sub_surface_extension" version="1">
-        <request name="get_sub_surface_aware_surface">
-            <arg name="id" type="new_id" interface="qt_sub_surface"/>
-            <arg name="surface" type="object" interface="wl_surface"/>
-        </request>
-    </interface>
-
-    <interface name="qt_sub_surface" version="1">
-        <request name="attach_sub_surface">
-            <arg name="sub_surface" type="object" interface="qt_sub_surface"/>
-            <arg name="x" type="int"/>
-            <arg name="y" type="int"/>
-        </request>
-
-        <request name="move_sub_surface">
-            <arg name="sub_surface" type="object" interface="qt_sub_surface"/>
-            <arg name="x" type="int"/>
-            <arg name="y" type="int"/>
-        </request>
-
-        <request name="raise">
-            <arg name="sub_surface" type="object" interface="qt_sub_surface"/>
-        </request>
-
-        <request name="lower">
-            <arg name="sub_surface" type="object" interface="qt_sub_surface"/>
-        </request>
-    </interface>
-</protocol>
diff --git a/src/plugins/platforms/wayland/client.pro b/src/plugins/platforms/wayland/client.pro
index 212ce0d5965..ca0e0a7d0ba 100644
--- a/src/plugins/platforms/wayland/client.pro
+++ b/src/plugins/platforms/wayland/client.pro
@@ -45,7 +45,6 @@ INCLUDEPATH += $$PWD/../shared
 WAYLANDCLIENTSOURCES += \
             ../3rdparty/protocol/wayland.xml \
             ../extensions/surface-extension.xml \
-            ../extensions/sub-surface-extension.xml \
             ../extensions/touch-extension.xml \
             ../extensions/qtkey-extension.xml \
             ../extensions/windowmanager.xml \