diff --git a/src/plugins/qmldesigner/extrasplugin/extras.metainfo b/src/plugins/qmldesigner/extrasplugin/extras.metainfo new file mode 100644 index 00000000000..d074cefe05b --- /dev/null +++ b/src/plugins/qmldesigner/extrasplugin/extras.metainfo @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/plugins/qmldesigner/extrasplugin/extrasplugin.cpp b/src/plugins/qmldesigner/extrasplugin/extrasplugin.cpp new file mode 100644 index 00000000000..f4fd844abbc --- /dev/null +++ b/src/plugins/qmldesigner/extrasplugin/extrasplugin.cpp @@ -0,0 +1,58 @@ +/************************************************************************** +** +** This file is part of Qt Creator +** +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). +** +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** No Commercial Usage +** +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** 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, 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. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +**************************************************************************/ + +#include "extrasplugin.h" +#include +#include + +namespace QmlDesigner { + + +ExtrasPlugin::ExtrasPlugin() +{ +} + +QString ExtrasPlugin::pluginName() +{ + return ("ExtrasPlugin"); +} + +QString ExtrasPlugin::metaInfo() +{ + return QString(":/extrasplugin/extras.metainfo"); +} + +} + +Q_EXPORT_PLUGIN(QmlDesigner::ExtrasPlugin) + diff --git a/src/plugins/qmldesigner/extrasplugin/extrasplugin.h b/src/plugins/qmldesigner/extrasplugin/extrasplugin.h new file mode 100644 index 00000000000..db069308bc1 --- /dev/null +++ b/src/plugins/qmldesigner/extrasplugin/extrasplugin.h @@ -0,0 +1,62 @@ +/************************************************************************** +** +** This file is part of Qt Creator +** +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). +** +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** No Commercial Usage +** +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** 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, 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. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +**************************************************************************/ + +#ifndef EXTRASPLUGIN_H +#define EXTRASPLUGIN_H + +#include +#include + +QT_BEGIN_NAMESPACE +QT_END_NAMESPACE + +namespace QmlDesigner { + +class ExtrasPlugin : public QObject, QmlDesigner::IWidgetPlugin +{ + Q_OBJECT + Q_DISABLE_COPY(ExtrasPlugin) + Q_INTERFACES(QmlDesigner::IWidgetPlugin) +public: + ExtrasPlugin(); + ~ExtrasPlugin() {} + + QString metaInfo(); + QString pluginName(); + +}; + +} // namespace QmlDesigner + + +#endif // EXTRASPLUGIN_H diff --git a/src/plugins/qmldesigner/extrasplugin/extrasplugin.pri b/src/plugins/qmldesigner/extrasplugin/extrasplugin.pri new file mode 100644 index 00000000000..12f923cb1e5 --- /dev/null +++ b/src/plugins/qmldesigner/extrasplugin/extrasplugin.pri @@ -0,0 +1,17 @@ +TARGET = extrasplugin +TEMPLATE = lib +CONFIG += plugin + +QT += script \ + declarative + +include (../designercore/iwidgetplugin.pri) + +DEFINES += SYMBIAN_LIBRARY +SOURCES += $$PWD/extrasplugin.cpp + +HEADERS += $$PWD/extrasplugin.h $$PWD/../designercore/include/iwidgetplugin.h + +RESOURCES += $$PWD/extrasplugin.qrc + +OTHER_FILES += $$PWD/extras.metainfo diff --git a/src/plugins/qmldesigner/extrasplugin/extrasplugin.pro b/src/plugins/qmldesigner/extrasplugin/extrasplugin.pro new file mode 100644 index 00000000000..8fffeb67761 --- /dev/null +++ b/src/plugins/qmldesigner/extrasplugin/extrasplugin.pro @@ -0,0 +1,4 @@ +include(../../../../qtcreator.pri) +include(../../../private_headers.pri) +include(extrasplugin.pri) +include(plugindestdir.pri) diff --git a/src/plugins/qmldesigner/extrasplugin/extrasplugin.qrc b/src/plugins/qmldesigner/extrasplugin/extrasplugin.qrc new file mode 100644 index 00000000000..ae97ba05e9d --- /dev/null +++ b/src/plugins/qmldesigner/extrasplugin/extrasplugin.qrc @@ -0,0 +1,31 @@ + + + extras.metainfo + images/count-bubble-16.png + images/count-bubble-24.png + images/date-picker-16.png + images/date-picker-24.png + images/info-banner-16.png + images/info-banner-24.png + images/list-button-16.png + images/list-button-24.png + images/list-delegate-16.png + images/list-delegate-24.png + images/more-indicator-16.png + images/more-indicator-24.png + images/page-indicator-16.png + images/page-indicator-24.png + images/rating-indicator-16.png + images/rating-indicator-24.png + images/time-picker-16.png + images/time-picker-24.png + images/tumbler-16.png + images/tumbler-24.png + images/tumbler-button-16.png + images/tumbler-button-24.png + images/tumbler-column-16.png + images/tumbler-column-24.png + images/tumbler-dialog-16.png + images/tumbler-dialog-24.png + + diff --git a/src/plugins/qmldesigner/extrasplugin/images/count-bubble-16.png b/src/plugins/qmldesigner/extrasplugin/images/count-bubble-16.png new file mode 100644 index 00000000000..2ac1430602d Binary files /dev/null and b/src/plugins/qmldesigner/extrasplugin/images/count-bubble-16.png differ diff --git a/src/plugins/qmldesigner/extrasplugin/images/count-bubble-24.png b/src/plugins/qmldesigner/extrasplugin/images/count-bubble-24.png new file mode 100644 index 00000000000..ba444822d51 Binary files /dev/null and b/src/plugins/qmldesigner/extrasplugin/images/count-bubble-24.png differ diff --git a/src/plugins/qmldesigner/extrasplugin/images/date-picker-16.png b/src/plugins/qmldesigner/extrasplugin/images/date-picker-16.png new file mode 100644 index 00000000000..b8eb95b737a Binary files /dev/null and b/src/plugins/qmldesigner/extrasplugin/images/date-picker-16.png differ diff --git a/src/plugins/qmldesigner/extrasplugin/images/date-picker-24.png b/src/plugins/qmldesigner/extrasplugin/images/date-picker-24.png new file mode 100644 index 00000000000..a8ee7e08473 Binary files /dev/null and b/src/plugins/qmldesigner/extrasplugin/images/date-picker-24.png differ diff --git a/src/plugins/qmldesigner/extrasplugin/images/info-banner-16.png b/src/plugins/qmldesigner/extrasplugin/images/info-banner-16.png new file mode 100644 index 00000000000..379413808bc Binary files /dev/null and b/src/plugins/qmldesigner/extrasplugin/images/info-banner-16.png differ diff --git a/src/plugins/qmldesigner/extrasplugin/images/info-banner-24.png b/src/plugins/qmldesigner/extrasplugin/images/info-banner-24.png new file mode 100644 index 00000000000..bf8aa614d0a Binary files /dev/null and b/src/plugins/qmldesigner/extrasplugin/images/info-banner-24.png differ diff --git a/src/plugins/qmldesigner/extrasplugin/images/list-button-16.png b/src/plugins/qmldesigner/extrasplugin/images/list-button-16.png new file mode 100644 index 00000000000..2b1ce900b82 Binary files /dev/null and b/src/plugins/qmldesigner/extrasplugin/images/list-button-16.png differ diff --git a/src/plugins/qmldesigner/extrasplugin/images/list-button-24.png b/src/plugins/qmldesigner/extrasplugin/images/list-button-24.png new file mode 100644 index 00000000000..d432090f9ca Binary files /dev/null and b/src/plugins/qmldesigner/extrasplugin/images/list-button-24.png differ diff --git a/src/plugins/qmldesigner/extrasplugin/images/list-delegate-16.png b/src/plugins/qmldesigner/extrasplugin/images/list-delegate-16.png new file mode 100644 index 00000000000..3c97433f087 Binary files /dev/null and b/src/plugins/qmldesigner/extrasplugin/images/list-delegate-16.png differ diff --git a/src/plugins/qmldesigner/extrasplugin/images/list-delegate-24.png b/src/plugins/qmldesigner/extrasplugin/images/list-delegate-24.png new file mode 100644 index 00000000000..c4d98869206 Binary files /dev/null and b/src/plugins/qmldesigner/extrasplugin/images/list-delegate-24.png differ diff --git a/src/plugins/qmldesigner/extrasplugin/images/more-indicator-16.png b/src/plugins/qmldesigner/extrasplugin/images/more-indicator-16.png new file mode 100644 index 00000000000..81eff7306c9 Binary files /dev/null and b/src/plugins/qmldesigner/extrasplugin/images/more-indicator-16.png differ diff --git a/src/plugins/qmldesigner/extrasplugin/images/more-indicator-24.png b/src/plugins/qmldesigner/extrasplugin/images/more-indicator-24.png new file mode 100644 index 00000000000..f5d8dedbfba Binary files /dev/null and b/src/plugins/qmldesigner/extrasplugin/images/more-indicator-24.png differ diff --git a/src/plugins/qmldesigner/extrasplugin/images/page-indicator-16.png b/src/plugins/qmldesigner/extrasplugin/images/page-indicator-16.png new file mode 100644 index 00000000000..29a89337514 Binary files /dev/null and b/src/plugins/qmldesigner/extrasplugin/images/page-indicator-16.png differ diff --git a/src/plugins/qmldesigner/extrasplugin/images/page-indicator-24.png b/src/plugins/qmldesigner/extrasplugin/images/page-indicator-24.png new file mode 100644 index 00000000000..60dda334fc5 Binary files /dev/null and b/src/plugins/qmldesigner/extrasplugin/images/page-indicator-24.png differ diff --git a/src/plugins/qmldesigner/extrasplugin/images/rating-indicator-16.png b/src/plugins/qmldesigner/extrasplugin/images/rating-indicator-16.png new file mode 100644 index 00000000000..2df5418a848 Binary files /dev/null and b/src/plugins/qmldesigner/extrasplugin/images/rating-indicator-16.png differ diff --git a/src/plugins/qmldesigner/extrasplugin/images/rating-indicator-24.png b/src/plugins/qmldesigner/extrasplugin/images/rating-indicator-24.png new file mode 100644 index 00000000000..393b2ffa695 Binary files /dev/null and b/src/plugins/qmldesigner/extrasplugin/images/rating-indicator-24.png differ diff --git a/src/plugins/qmldesigner/extrasplugin/images/time-picker-16.png b/src/plugins/qmldesigner/extrasplugin/images/time-picker-16.png new file mode 100644 index 00000000000..1ee49cafbd5 Binary files /dev/null and b/src/plugins/qmldesigner/extrasplugin/images/time-picker-16.png differ diff --git a/src/plugins/qmldesigner/extrasplugin/images/time-picker-24.png b/src/plugins/qmldesigner/extrasplugin/images/time-picker-24.png new file mode 100644 index 00000000000..979981bd318 Binary files /dev/null and b/src/plugins/qmldesigner/extrasplugin/images/time-picker-24.png differ diff --git a/src/plugins/qmldesigner/extrasplugin/images/tumbler-16.png b/src/plugins/qmldesigner/extrasplugin/images/tumbler-16.png new file mode 100644 index 00000000000..afcf864744d Binary files /dev/null and b/src/plugins/qmldesigner/extrasplugin/images/tumbler-16.png differ diff --git a/src/plugins/qmldesigner/extrasplugin/images/tumbler-24.png b/src/plugins/qmldesigner/extrasplugin/images/tumbler-24.png new file mode 100644 index 00000000000..43783e6ee23 Binary files /dev/null and b/src/plugins/qmldesigner/extrasplugin/images/tumbler-24.png differ diff --git a/src/plugins/qmldesigner/extrasplugin/images/tumbler-button-16.png b/src/plugins/qmldesigner/extrasplugin/images/tumbler-button-16.png new file mode 100644 index 00000000000..4368493c3e7 Binary files /dev/null and b/src/plugins/qmldesigner/extrasplugin/images/tumbler-button-16.png differ diff --git a/src/plugins/qmldesigner/extrasplugin/images/tumbler-button-24.png b/src/plugins/qmldesigner/extrasplugin/images/tumbler-button-24.png new file mode 100644 index 00000000000..6b0b71a65af Binary files /dev/null and b/src/plugins/qmldesigner/extrasplugin/images/tumbler-button-24.png differ diff --git a/src/plugins/qmldesigner/extrasplugin/images/tumbler-column-16.png b/src/plugins/qmldesigner/extrasplugin/images/tumbler-column-16.png new file mode 100644 index 00000000000..36e2d27608e Binary files /dev/null and b/src/plugins/qmldesigner/extrasplugin/images/tumbler-column-16.png differ diff --git a/src/plugins/qmldesigner/extrasplugin/images/tumbler-column-24.png b/src/plugins/qmldesigner/extrasplugin/images/tumbler-column-24.png new file mode 100644 index 00000000000..8a043798f1c Binary files /dev/null and b/src/plugins/qmldesigner/extrasplugin/images/tumbler-column-24.png differ diff --git a/src/plugins/qmldesigner/extrasplugin/images/tumbler-dialog-16.png b/src/plugins/qmldesigner/extrasplugin/images/tumbler-dialog-16.png new file mode 100644 index 00000000000..5a105a76db9 Binary files /dev/null and b/src/plugins/qmldesigner/extrasplugin/images/tumbler-dialog-16.png differ diff --git a/src/plugins/qmldesigner/extrasplugin/images/tumbler-dialog-24.png b/src/plugins/qmldesigner/extrasplugin/images/tumbler-dialog-24.png new file mode 100644 index 00000000000..a6bbc2d795e Binary files /dev/null and b/src/plugins/qmldesigner/extrasplugin/images/tumbler-dialog-24.png differ diff --git a/src/plugins/qmldesigner/extrasplugin/plugindestdir.pri b/src/plugins/qmldesigner/extrasplugin/plugindestdir.pri new file mode 100644 index 00000000000..24f0c19b72b --- /dev/null +++ b/src/plugins/qmldesigner/extrasplugin/plugindestdir.pri @@ -0,0 +1,5 @@ +macx { + DESTDIR = $$IDE_LIBRARY_PATH/QmlDesigner +} else { + DESTDIR = $$IDE_BUILD_TREE/lib/qmldesigner +} diff --git a/src/plugins/qmldesigner/qmldesigner.pro b/src/plugins/qmldesigner/qmldesigner.pro index 1c1a3735f31..bab7341b1f4 100644 --- a/src/plugins/qmldesigner/qmldesigner.pro +++ b/src/plugins/qmldesigner/qmldesigner.pro @@ -1,3 +1,3 @@ TEMPLATE = subdirs -SUBDIRS = qmldesignerplugin.pro qtquickplugin symbianplugin meegoplugin +SUBDIRS = qmldesignerplugin.pro qtquickplugin symbianplugin meegoplugin extrasplugin