summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Olav Tvete <paul.tvete@qt.io>2016-12-15 13:24:00 +0100
committerPaul Olav Tvete <paul.tvete@qt.io>2017-01-02 12:30:25 +0000
commite26696524ceb58f4fe0cb7202d873240b6a9478d (patch)
tree0a55cc719068f7135626d4c7024f27916233df95
parent568e7160184cb9312f115fb61ac06f4a90b2d982 (diff)
Remove unused files from example
Change-Id: I8ce9c4b284da2d3e7f88e8449be22f9a25b5a2e0 Reviewed-by: Johan Helsing <johan.helsing@qt.io>
-rw-r--r--examples/wayland/custom-extension/client-common/client.json3
-rw-r--r--examples/wayland/custom-extension/client-common/client.pro19
-rw-r--r--examples/wayland/custom-extension/client-common/main.cpp81
3 files changed, 0 insertions, 103 deletions
diff --git a/examples/wayland/custom-extension/client-common/client.json b/examples/wayland/custom-extension/client-common/client.json
deleted file mode 100644
index 7aab544e5..000000000
--- a/examples/wayland/custom-extension/client-common/client.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "Keys": [ "custom-wayland" ]
-}
diff --git a/examples/wayland/custom-extension/client-common/client.pro b/examples/wayland/custom-extension/client-common/client.pro
deleted file mode 100644
index 95b99578a..000000000
--- a/examples/wayland/custom-extension/client-common/client.pro
+++ /dev/null
@@ -1,19 +0,0 @@
-CONFIG += wayland-scanner
-TARGET = custom-wayland
-
-QT += waylandclient-private
-
-WAYLANDCLIENTSOURCES += ../protocol/custom.xml
-
-OTHER_FILES += client.json
-
-SOURCES += main.cpp \
- customextension.cpp
-
-HEADERS += customextension.h
-
-PLUGIN_TYPE = platforms
-load(qt_plugin)
-
-# Installation into a "proper" Qt location is most unexpected for from an example.
-CONFIG += install_ok
diff --git a/examples/wayland/custom-extension/client-common/main.cpp b/examples/wayland/custom-extension/client-common/main.cpp
deleted file mode 100644
index 8c27fa77d..000000000
--- a/examples/wayland/custom-extension/client-common/main.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Wayland module
-**
-** $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 <qpa/qplatformintegrationplugin.h>
-#include <QtWaylandClient/private/qwaylandintegration_p.h>
-#include "customextension.h"
-
-#include <QGuiApplication>
-#include <QDebug>
-
-QT_BEGIN_NAMESPACE
-
-static CustomExtension * extension_global;
-
-class CustomIntegrationPlugin : public QPlatformIntegrationPlugin
-{
- Q_OBJECT
- Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "client.json")
-public:
- QPlatformIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE;
-};
-
- QPlatformIntegration *CustomIntegrationPlugin::create(const QString& system, const QStringList& paramList)
-{
- Q_UNUSED(paramList);
- Q_UNUSED(system);
-
- qDebug() << "************* The Qt Custom Extension Example Plugin is active ************";
-
- extension_global = new CustomExtension();
-
- // We need a way for client apps to get hold of the extension. The proper API for this is
- // QPlatformNativeInterface, but that's a low-level API using void*. There will be a nice
- // client API at some point, but in the meantime, it is easier to use QObject::findChild().
-
- extension_global->setParent(qApp);
- extension_global->setObjectName("qt_example_custom_extension");
-
- return extension_global->integration();
-}
-
-QT_END_NAMESPACE
-
-#include "main.moc"