Remove the default shell functionality

This will be readded in a different way. Also, remove the
WaylandSurfaceChrome since it is no longer needed, and just use
WaylandView directly

Change-Id: I8d4a7b2135d9fdaea7dd3fcd729e55cceebf48fb

4 files changed, 3 insertions, 92 deletions

diff --git a/src/imports/compositor/WaylandCursorItem.qml b/src/imports/compositor/WaylandCursorItem.qml
index 609cad7ad..4938ff94b 100644
--- a/src/imports/compositor/WaylandCursorItem.qml
+++ b/src/imports/compositor/WaylandCursorItem.qml
@@ -34,7 +34,7 @@
 import QtQuick 2.0
 import QtWayland.Compositor 1.0
 
-WaylandSurfaceView {
+WaylandView {
     id: cursorItem
     property QtObject compositor
     property int hotspotX: 0
diff --git a/src/imports/compositor/WaylandSurfaceChrome.qml b/src/imports/compositor/WaylandSurfaceChrome.qml
deleted file mode 100644
index 7f9ae8025..000000000
--- a/src/imports/compositor/WaylandSurfaceChrome.qml
+++ /dev/null
@@ -1,87 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Item {
-    id: chrome
-
-    width: childrenRect.width
-    height: childrenRect.height
-
-    property QtObject surface
-    property Item view
-
-    property bool automaticUseShellView: false
-    property bool automaticDestroyOnSurfaceDestroy: true
-
-    property bool followRequestedPosition: false
-    property real requestedXPosition
-    property real requestedYPosition
-
-    signal surfaceDestroyed
-
-    Connections {
-        target: surface
-
-        onShellViewCreated: {
-            if (chrome.automaticUseShellView)
-                view = surface.shellView;
-        }
-
-        onSurfaceDestroyed: {
-            if (automaticDestroyOnSurfaceDestroy)
-                chrome.destroy();
-        }
-    }
-
-    Component.onCompleted: {
-        if (chrome.automaticUseShellView && !view && surface.shellView)
-            view = surface.shellView;
-    }
-
-    onViewChanged: {
-        if (view) {
-            view.parent = chrome;
-            view.followRequestedPosition = Qt.binding(function() { return chrome.followRequestedPosition; });
-            chrome.visible = Qt.binding(function() { return view.visible; });
-            chrome.requestedXPosition = Qt.binding(function() { return view.requestedXPosition; });
-            chrome.requestedYPosition = Qt.binding(function() { return view.requestedYPosition; });
-            view.surfaceDestroyed.connect(function() { chrome.surfaceDestroyed(); });
-        } else {
-            chrome.visible = false;
-        }
-    }
-
-    Component.onDestruction: { if (view) view.destroy(); }
-}
diff --git a/src/imports/compositor/compositor.pro b/src/imports/compositor/compositor.pro
index 1f930d870..80bda74b1 100644
--- a/src/imports/compositor/compositor.pro
+++ b/src/imports/compositor/compositor.pro
@@ -11,7 +11,6 @@ SOURCES += \
     qwaylandmousetracker.cpp
 
 COMPOSITOR_QML_FILES += \
-    WaylandSurfaceChrome.qml \
     WaylandOutputWindow.qml \
     WaylandCursorItem.qml \
     qmldir
diff --git a/src/imports/compositor/qwaylandquickcompositorplugin.cpp b/src/imports/compositor/qwaylandquickcompositorplugin.cpp
index 1b78ce8ae..8af03a790 100644
--- a/src/imports/compositor/qwaylandquickcompositorplugin.cpp
+++ b/src/imports/compositor/qwaylandquickcompositorplugin.cpp
@@ -136,12 +136,11 @@ public:
 
         bool useResource = true;
         QDir qmlDir(baseUrl().toLocalFile());
-        if (qmlDir.exists(QStringLiteral("WaylandSurfaceChrome.qml")))
+        if (qmlDir.exists(QStringLiteral("WaylandCursorItem.qml")))
             useResource = false;
 
         QmlUrlResolver resolver(useResource, qmlDir, QStringLiteral("qrc:/QtWayland/Compositor/"));
 
-        qmlRegisterType(resolver.get(QStringLiteral("WaylandSurfaceChrome.qml")), uri, 1, 0, "WaylandSurfaceChrome");
         qmlRegisterType(resolver.get(QStringLiteral("WaylandOutputWindow.qml")), uri, 1, 0, "WaylandOutputWindow");
         qmlRegisterType(resolver.get(QStringLiteral("WaylandCursorItem.qml")), uri, 1, 0, "WaylandCursorItem");
     }
@@ -151,7 +150,7 @@ public:
         qmlRegisterType<QWaylandQuickCompositorImpl>(uri, 1, 0, "WaylandCompositor");
         qmlRegisterType<QWaylandQuickItem>(uri, 1, 0, "WaylandView");
         qmlRegisterType<QWaylandMouseTracker>(uri, 1, 0, "WaylandMouseTracker");
-        qmlRegisterUncreatableType<QWaylandQuickSurface>(uri, 1, 0, "WaylandQuickSurface", QObject::tr("Cannot create instance of WaylandQuickSurface"));
+        qmlRegisterUncreatableType<QWaylandQuickSurface>(uri, 1, 0, "WaylandSurface", QObject::tr("Cannot create instance of WaylandQuickSurface"));
         qmlRegisterUncreatableType<QWaylandClient>(uri, 1, 0, "WaylandClient", QObject::tr("Cannot create instance of WaylandClient"));
         qmlRegisterUncreatableType<QWaylandOutput>(uri, 1, 0, "WaylandOutput", QObject::tr("Cannot create instance of WaylandOutput"));
         qmlRegisterUncreatableType<QWaylandOutputSpace>(uri, 1, 0, "WaylandOutputSpace", QObject::tr("Cannot create instance of WaylandOutputSpace"));