diff options
author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-07-29 12:15:17 +0200 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@digia.com> | 2014-08-06 15:48:02 +0200 |
commit | 28fe4e3a864b799e4e4b9e0c2dc251f03459d85e (patch) | |
tree | fbd8970a8fbcd997ec9c408af4fe0d94713c2aaa /src/plugins/generic/meego | |
parent | 54ca39afec6c3a175da085a704772b28f42bc274 (diff) |
Remove specific maemo/meego codepaths
We no longer support the maemo/meego platform, so we can remove the
specific code for that platform.
Change-Id: Ia7f0730eba2d96794b97b7ca4753f63a2d7bc2a8
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Diffstat (limited to 'src/plugins/generic/meego')
-rw-r--r-- | src/plugins/generic/meego/contextkitproperty.cpp | 85 | ||||
-rw-r--r-- | src/plugins/generic/meego/contextkitproperty.h | 66 | ||||
-rw-r--r-- | src/plugins/generic/meego/main.cpp | 68 | ||||
-rw-r--r-- | src/plugins/generic/meego/meego.json | 3 | ||||
-rw-r--r-- | src/plugins/generic/meego/meego.pro | 14 | ||||
-rw-r--r-- | src/plugins/generic/meego/qmeegointegration.cpp | 81 | ||||
-rw-r--r-- | src/plugins/generic/meego/qmeegointegration.h | 68 |
7 files changed, 0 insertions, 385 deletions
diff --git a/src/plugins/generic/meego/contextkitproperty.cpp b/src/plugins/generic/meego/contextkitproperty.cpp deleted file mode 100644 index 36d431e0cc..0000000000 --- a/src/plugins/generic/meego/contextkitproperty.cpp +++ /dev/null @@ -1,85 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 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:LGPL$ -** 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 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: 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. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 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 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "contextkitproperty.h" - -#include <QDBusReply> -#include <QDebug> - -static QString objectPathForProperty(const QString& property) -{ - QString path = property; - if (!path.startsWith(QLatin1Char('/'))) { - path.replace(QLatin1Char('.'), QLatin1Char('/')); - path.prepend(QLatin1String("/org/maemo/contextkit/")); - } - return path; -} - -QContextKitProperty::QContextKitProperty(const QString& serviceName, const QString& propertyName) - : propertyInterface(serviceName, objectPathForProperty(propertyName), - QLatin1String("org.maemo.contextkit.Property"), QDBusConnection::systemBus()) -{ - propertyInterface.call("Subscribe"); - connect(&propertyInterface, SIGNAL(ValueChanged(QVariantList,qulonglong)), - this, SLOT(cacheValue(QVariantList,qulonglong))); - - QDBusMessage reply = propertyInterface.call("Get"); - if (reply.type() == QDBusMessage::ReplyMessage) - cachedValue = qdbus_cast<QList<QVariant> >(reply.arguments().value(0)).value(0); -} - -QContextKitProperty::~QContextKitProperty() -{ - propertyInterface.call("Unsubscribe"); -} - -QVariant QContextKitProperty::value() const -{ - return cachedValue; -} - -void QContextKitProperty::cacheValue(const QVariantList& values, qulonglong) -{ - cachedValue = values.value(0); - emit valueChanged(cachedValue); -} - diff --git a/src/plugins/generic/meego/contextkitproperty.h b/src/plugins/generic/meego/contextkitproperty.h deleted file mode 100644 index 4c7c64d4e5..0000000000 --- a/src/plugins/generic/meego/contextkitproperty.h +++ /dev/null @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 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:LGPL$ -** 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 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: 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. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 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 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef CONTEXTKITPROPERTY_H -#define CONTEXTKITPROPERTY_H - -#include <QDBusInterface> - -class QContextKitProperty : public QObject -{ - Q_OBJECT -public: - QContextKitProperty(const QString& serviceName, const QString& propertyName); - ~QContextKitProperty(); - - QVariant value() const; - -signals: - void valueChanged(const QVariant& value); - -private slots: - void cacheValue(const QVariantList& values, qulonglong); - -private: - QDBusInterface propertyInterface; - QVariant cachedValue; -}; - -#endif // CONTEXTKITPROPERTY_H diff --git a/src/plugins/generic/meego/main.cpp b/src/plugins/generic/meego/main.cpp deleted file mode 100644 index 0e39b31a2a..0000000000 --- a/src/plugins/generic/meego/main.cpp +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 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:LGPL$ -** 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 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: 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. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 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 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include <QtGui/qgenericplugin.h> -#include "qmeegointegration.h" - -QT_BEGIN_NAMESPACE - -class QMeeGoIntegrationPlugin : public QGenericPlugin -{ - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QGenericPluginFactoryInterface" FILE "meego.json") -public: - QMeeGoIntegrationPlugin(); - - QObject* create(const QString &key, const QString &specification); -}; - -QMeeGoIntegrationPlugin::QMeeGoIntegrationPlugin() - : QGenericPlugin() -{ -} - -QObject* QMeeGoIntegrationPlugin::create(const QString &key, const QString &specification) -{ - if (!key.compare(QLatin1String("MeeGoIntegration"), Qt::CaseInsensitive)) - return new QMeeGoIntegration(); - return 0; -} - -QT_END_NAMESPACE diff --git a/src/plugins/generic/meego/meego.json b/src/plugins/generic/meego/meego.json deleted file mode 100644 index b475b67f25..0000000000 --- a/src/plugins/generic/meego/meego.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "Keys": [ "MeeGoIntegration" ] -} diff --git a/src/plugins/generic/meego/meego.pro b/src/plugins/generic/meego/meego.pro deleted file mode 100644 index 4baaa43a4c..0000000000 --- a/src/plugins/generic/meego/meego.pro +++ /dev/null @@ -1,14 +0,0 @@ -TARGET = qmeegointegration - -PLUGIN_TYPE = generic -PLUGIN_EXTENDS = - -PLUGIN_CLASS_NAME = QMeeGoIntegrationPlugin -load(qt_plugin) - -SOURCES = qmeegointegration.cpp \ - main.cpp \ - contextkitproperty.cpp -HEADERS = qmeegointegration.h \ - contextkitproperty.h - -QT = core-private gui-private dbus gui-private diff --git a/src/plugins/generic/meego/qmeegointegration.cpp b/src/plugins/generic/meego/qmeegointegration.cpp deleted file mode 100644 index 97206d47d3..0000000000 --- a/src/plugins/generic/meego/qmeegointegration.cpp +++ /dev/null @@ -1,81 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 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:LGPL$ -** 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 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: 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. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 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 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qmeegointegration.h" - -#include <QDebug> -#include <QDBusConnection> -#include <QDBusArgument> -#include <qguiapplication.h> -#include <qpa/qwindowsysteminterface.h> - -QMeeGoIntegration::QMeeGoIntegration() - : screenTopEdge(QStringLiteral("com.nokia.SensorService"), QStringLiteral("Screen.TopEdge")) -{ - connect(&screenTopEdge, SIGNAL(valueChanged(QVariant)), - this, SLOT(updateScreenOrientation(QVariant))); - updateScreenOrientation(screenTopEdge.value()); -} - -QMeeGoIntegration::~QMeeGoIntegration() -{ -} - -void QMeeGoIntegration::updateScreenOrientation(const QVariant& topEdgeValue) -{ - QString edge = topEdgeValue.toString(); - Qt::ScreenOrientation orientation = Qt::PrimaryOrientation; - - // ### FIXME: This isn't perfect. We should obey the video_route (tv connected) and - // the keyboard slider. - - if (edge == QLatin1String("top")) - orientation = Qt::LandscapeOrientation; - else if (edge == QLatin1String("left")) - orientation = Qt::PortraitOrientation; - else if (edge == QLatin1String("right")) - orientation = Qt::InvertedPortraitOrientation; - else if (edge == QLatin1String("bottom")) - orientation = Qt::InvertedLandscapeOrientation; - - QWindowSystemInterface::handleScreenOrientationChange(QGuiApplication::primaryScreen(), orientation); -} - diff --git a/src/plugins/generic/meego/qmeegointegration.h b/src/plugins/generic/meego/qmeegointegration.h deleted file mode 100644 index 998bbbf8d3..0000000000 --- a/src/plugins/generic/meego/qmeegointegration.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 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:LGPL$ -** 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 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: 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. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 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 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QMEEGOINTEGRATION_H -#define QMEEGOINTEGRATION_H - -#include <QObject> -#include <QDBusInterface> - -#include "contextkitproperty.h" - -QT_BEGIN_NAMESPACE - -class QMeeGoIntegration : public QObject -{ - Q_OBJECT -public: - QMeeGoIntegration(); - ~QMeeGoIntegration(); - -private Q_SLOTS: - void updateScreenOrientation(const QVariant& topEdgeValue); - -private: - QContextKitProperty screenTopEdge; -}; - -QT_END_NAMESPACE - -#endif // QMEEGOINTEGRATION_H |