summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-05-18 09:27:49 +0200
committerFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-05-18 08:37:55 +0000
commit79aff17bc604f126c507ca329dcdc42b34609886 (patch)
tree3e27336424356ba323d0896132de5e3eb91e575d
parent7bf5bb1a7f54f775534a3d940c44d3bf78725306 (diff)
Remove duplicated Qt Designer plugin from tools.
This code was never compiled, the Qt Designer plugin is under src/plugins. Change-Id: Ic25dc965bcca458322c089a3b5dfe4765fec0556 Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
-rw-r--r--tools/designer/src/plugins/plugins.pri5
-rw-r--r--tools/designer/src/plugins/plugins.pro5
-rw-r--r--tools/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro7
-rw-r--r--tools/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.cpp122
-rw-r--r--tools/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.h67
5 files changed, 0 insertions, 206 deletions
diff --git a/tools/designer/src/plugins/plugins.pri b/tools/designer/src/plugins/plugins.pri
deleted file mode 100644
index 330a2e7f..00000000
--- a/tools/designer/src/plugins/plugins.pri
+++ /dev/null
@@ -1,5 +0,0 @@
-QT += designer declarative
-
-PLUGIN_TYPE = designer
-CONFIG += tool_plugin
-load(qt_plugin)
diff --git a/tools/designer/src/plugins/plugins.pro b/tools/designer/src/plugins/plugins.pro
deleted file mode 100644
index f08a74e5..00000000
--- a/tools/designer/src/plugins/plugins.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-TEMPLATE = subdirs
-CONFIG += ordered
-
-REQUIRES = !CONFIG(static,shared|static)
-SUBDIRS += qdeclarativeview
diff --git a/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro b/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro
deleted file mode 100644
index c179e47c..00000000
--- a/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro
+++ /dev/null
@@ -1,7 +0,0 @@
-TARGET = qdeclarativeview
-
-PLUGIN_CLASS_NAME = QDeclarativeViewPlugin
-include(../plugins.pri)
-
-SOURCES += qdeclarativeview_plugin.cpp
-HEADERS += qdeclarativeview_plugin.h
diff --git a/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.cpp b/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.cpp
deleted file mode 100644
index fd534226..00000000
--- a/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.cpp
+++ /dev/null
@@ -1,122 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt Designer 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 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 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.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qdeclarativeview_plugin.h"
-
-#include <QtDesigner/QExtensionFactory>
-#include <QtDesigner/QExtensionManager>
-
-#include <QtCore/qplugin.h>
-#include <QtDeclarative/QDeclarativeView>
-
-static const char toolTipC[] = "QtDeclarative view widget";
-
-QT_BEGIN_NAMESPACE
-
-QDeclarativeViewPlugin::QDeclarativeViewPlugin(QObject *parent) :
- QObject(parent),
- m_initialized(false)
-{
-}
-
-QString QDeclarativeViewPlugin::name() const
-{
- return QLatin1String("QDeclarativeView");
-}
-
-QString QDeclarativeViewPlugin::group() const
-{
- return QLatin1String("Display Widgets");
-}
-
-QString QDeclarativeViewPlugin::toolTip() const
-{
- return tr(toolTipC);
-}
-
-QString QDeclarativeViewPlugin::whatsThis() const
-{
- return tr(toolTipC);
-}
-
-QString QDeclarativeViewPlugin::includeFile() const
-{
- return QLatin1String("QtDeclarative/QDeclarativeView");
-}
-
-QIcon QDeclarativeViewPlugin::icon() const
-{
- return QIcon();
-}
-
-bool QDeclarativeViewPlugin::isContainer() const
-{
- return false;
-}
-
-QWidget *QDeclarativeViewPlugin::createWidget(QWidget *parent)
-{
- return new QDeclarativeView(parent);
-}
-
-bool QDeclarativeViewPlugin::isInitialized() const
-{
- return m_initialized;
-}
-
-void QDeclarativeViewPlugin::initialize(QDesignerFormEditorInterface * /*core*/)
-{
- if (m_initialized)
- return;
-
- m_initialized = true;
-}
-
-QString QDeclarativeViewPlugin::domXml() const
-{
- return QLatin1String("\
- <ui language=\"c++\">\
- <widget class=\"QDeclarativeView\" name=\"declarativeView\">\
- <property name=\"geometry\">\
- <rect>\
- <x>0</x>\
- <y>0</y>\
- <width>300</width>\
- <height>200</height>\
- </rect>\
- </property>\
- </widget>\
- </ui>");
-}
-
-QT_END_NAMESPACE
diff --git a/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.h b/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.h
deleted file mode 100644
index 2d5d2d89..00000000
--- a/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt Designer 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 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 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.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QDECLARATIVEVIEW_PLUGIN_H
-#define QDECLARATIVEVIEW_PLUGIN_H
-
-#include <QtDesigner/QDesignerCustomWidgetInterface>
-
-QT_BEGIN_NAMESPACE
-
-class QDeclarativeViewPlugin: public QObject, public QDesignerCustomWidgetInterface
-{
- Q_OBJECT
- Q_PLUGIN_METADATA(IID "org.qt-project.QDesignerCustomWidgetInterface")
- Q_INTERFACES(QDesignerCustomWidgetInterface)
-public:
- QDeclarativeViewPlugin(QObject *parent = 0);
-
- virtual QString name() const;
- virtual QString group() const;
- virtual QString toolTip() const;
- virtual QString whatsThis() const;
- virtual QString includeFile() const;
- virtual QIcon icon() const;
- virtual bool isContainer() const;
- virtual QWidget *createWidget(QWidget *parent);
- virtual bool isInitialized() const;
- virtual void initialize(QDesignerFormEditorInterface *core);
- virtual QString domXml() const;
-
-private:
- bool m_initialized;
-};
-
-QT_END_NAMESPACE
-
-#endif // QDECLARATIVEVIEW_PLUGIN_H