This plugin has moved to qtquick1

This somewhat untangles module dependencies, and removes
the qtquick1 dependency from qttools. It also leads to
compiling the designer plugin for a module together
with the module.

Change-Id: I8f18b1374ffb74a7753714b3162a67369b535c4d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

diff --git a/src/designer/src/plugins/plugins.pro b/src/designer/src/plugins/plugins.pro
index 645a4bd..c0d2428 100644 (file)
--- a/src/designer/src/plugins/plugins.pro
+++ b/src/designer/src/plugins/plugins.pro
@@ -5,5 +5,4 @@ REQUIRES = !CONFIG(static,shared|static)
 # contains(QT_CONFIG, opengl): SUBDIRS += tools/view3d
 contains(QT_CONFIG, webkit): SUBDIRS += qwebview
 contains(QT_CONFIG, phonon): SUBDIRS += phononwidgets
-contains(QT_CONFIG, quick1): SUBDIRS += qdeclarativeview
 win32: contains(QT_CONFIG, activeqt): SUBDIRS += activeqt

diff --git a/src/designer/src/plugins/qdeclarativeview/qdeclarativeview.json b/src/designer/src/plugins/qdeclarativeview/qdeclarativeview.json
deleted file mode 100644 (file)
index 0967ef4..0000000
--- a/src/designer/src/plugins/qdeclarativeview/qdeclarativeview.json
+++ /dev/null
@@ -1 +0,0 @@
-{}

diff --git a/src/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro b/src/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro
deleted file mode 100644 (file)
index 199819f..0000000
--- a/src/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro
+++ /dev/null
@@ -1,14 +0,0 @@
-TEMPLATE    = lib
-TARGET      = qdeclarativeview
-CONFIG     += qt warn_on plugin designer
-QT         += quick1 widgets
-
-include(../plugins.pri)
-build_all:!build_pass {
-    CONFIG -= build_all
-    CONFIG += release
-}
-
-SOURCES += qdeclarativeview_plugin.cpp
-HEADERS += qdeclarativeview_plugin.h
-OTHER_FILES += qdeclarativeview.json

diff --git a/src/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.cpp b/src/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.cpp
deleted file mode 100644 (file)
index cdc6097..0000000
--- a/src/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.cpp
+++ /dev/null
@@ -1,130 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the Qt Designer of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** 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, Nokia gives you certain additional
-** rights. These rights are described in the Nokia 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.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qdeclarativeview_plugin.h"
-
-#include <QtDesigner/QExtensionFactory>
-#include <QtDesigner/QExtensionManager>
-
-#include <QtCore/qplugin.h>
-#include <QtQuick1/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 QStringLiteral("QDeclarativeView");
-}
-
-QString QDeclarativeViewPlugin::group() const
-{
-    return QStringLiteral("Display Widgets");
-}
-
-QString QDeclarativeViewPlugin::toolTip() const
-{
-    return tr(toolTipC);
-}
-
-QString QDeclarativeViewPlugin::whatsThis() const
-{
-    return tr(toolTipC);
-}
-
-QString QDeclarativeViewPlugin::includeFile() const
-{
-    return QStringLiteral("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 QStringLiteral("\
-    <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/src/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.h b/src/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.h
deleted file mode 100644 (file)
index 32cfdbe..0000000
--- a/src/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the Qt Designer of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** 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, Nokia gives you certain additional
-** rights. These rights are described in the Nokia 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.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-**
-** $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.Qt.QDesignerCustomWidgetInterface" FILE "qdeclarativeview.json")
-    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