Remove automatic initialisation of extensions

It is the specific compositor application responsibillity to create the
specific extensions. Some of the extensions are picked up with the
QWaylandExtension::findIn(QWaylandExtensionContainer *) function to work
around missing events/apis. It should be a goal not to have these calles
in the base implementation of QWayland[Compositor|Surface|Input..].

Change-Id: Iacd576f2e8a79ca0165b858b1e8f44cddad48d93

3 files changed, 0 insertions, 140 deletions

diff --git a/src/compositor/hardware_integration/hardware_integration.pri b/src/compositor/hardware_integration/hardware_integration.pri
index 39843b3f5..68cbd4c52 100644
--- a/src/compositor/hardware_integration/hardware_integration.pri
+++ b/src/compositor/hardware_integration/hardware_integration.pri
@@ -4,7 +4,6 @@ isEmpty(QT_WAYLAND_GL_CONFIG):QT_WAYLAND_GL_CONFIG = $$(QT_WAYLAND_GL_CONFIG)
     CONFIG += wayland-scanner
     WAYLANDSERVERSOURCES += \
         ../extensions/server-buffer-extension.xml \
-        ../extensions/hardware-integration.xml
 
     HEADERS += \
         hardware_integration/qwlclientbufferintegration_p.h \
@@ -13,7 +12,6 @@ isEmpty(QT_WAYLAND_GL_CONFIG):QT_WAYLAND_GL_CONFIG = $$(QT_WAYLAND_GL_CONFIG)
         hardware_integration/qwlserverbufferintegration_p.h \
         hardware_integration/qwlserverbufferintegrationfactory_p.h \
         hardware_integration/qwlserverbufferintegrationplugin_p.h \
-        hardware_integration/qwlhwintegration_p.h
 
     SOURCES += \
         hardware_integration/qwlclientbufferintegration.cpp \
@@ -22,7 +20,6 @@ isEmpty(QT_WAYLAND_GL_CONFIG):QT_WAYLAND_GL_CONFIG = $$(QT_WAYLAND_GL_CONFIG)
         hardware_integration/qwlserverbufferintegration.cpp \
         hardware_integration/qwlserverbufferintegrationfactory.cpp \
         hardware_integration/qwlserverbufferintegrationplugin.cpp \
-        hardware_integration/qwlhwintegration.cpp
 
     DEFINES += QT_COMPOSITOR_WAYLAND_GL
 } else {
diff --git a/src/compositor/hardware_integration/qwlhwintegration.cpp b/src/compositor/hardware_integration/qwlhwintegration.cpp
deleted file mode 100644
index 68ab0d890..000000000
--- a/src/compositor/hardware_integration/qwlhwintegration.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the QtWaylandCompositor module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** 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 The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/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 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qwlhwintegration_p.h"
-
-#include <QtCompositor/QWaylandCompositor>
-
-QT_BEGIN_NAMESPACE
-
-namespace QtWayland {
-
-HardwareIntegration::HardwareIntegration(QWaylandCompositor *compositor)
-    : qt_hardware_integration(compositor->display(), 1)
-{
-}
-void HardwareIntegration::setClientBufferIntegration(const QString &name)
-{
-    m_client_buffer_integration = name;
-}
-void HardwareIntegration::setServerBufferIntegration(const QString &name)
-{
-    m_server_buffer_integration = name;
-}
-
-void HardwareIntegration::hardware_integration_bind_resource(Resource *resource)
-{
-    if (m_client_buffer_integration.size())
-        send_client_backend(resource->handle, m_client_buffer_integration);
-    if (m_server_buffer_integration.size())
-        send_server_backend(resource->handle, m_server_buffer_integration);
-}
-
-}
-
-QT_END_NAMESPACE
diff --git a/src/compositor/hardware_integration/qwlhwintegration_p.h b/src/compositor/hardware_integration/qwlhwintegration_p.h
deleted file mode 100644
index 42c6e685a..000000000
--- a/src/compositor/hardware_integration/qwlhwintegration_p.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the QtWaylandCompositor module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** 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 The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/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 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QWLHWINTEGRATION_P_H
-#define QWLHWINTEGRATION_P_H
-
-#include <QtCompositor/private/qwayland-server-hardware-integration.h>
-
-#include <QtCore/QString>
-
-QT_BEGIN_NAMESPACE
-
-class QWaylandCompositor;
-
-namespace QtWayland {
-
-class HardwareIntegration : public QtWaylandServer::qt_hardware_integration
-{
-public:
-    HardwareIntegration(QWaylandCompositor *compositor);
-
-    void setClientBufferIntegration(const QString &name);
-    void setServerBufferIntegration(const QString &name);
-
-protected:
-    void hardware_integration_bind_resource(Resource *resource);
-
-private:
-    QString m_client_buffer_integration;
-    QString m_server_buffer_integration;
-};
-
-}
-
-QT_END_NAMESPACE
-#endif