diff --git a/src/plugins/qmldesigner/extrasplugin/extras.metainfo b/src/plugins/qmldesigner/extrasplugin/extras.metainfo
new file mode 100644
index 0000000000000000000000000000000000000000..d074cefe05bb19fbab156a1378f03745dda30995
--- /dev/null
+++ b/src/plugins/qmldesigner/extrasplugin/extras.metainfo
@@ -0,0 +1,54 @@
+<metainfo>
+ <node name="CountBubble" icon=":/extrasplugin/images/count-bubble-16.png">
+ <itemlibraryentry name="CountBubble" category="Components Extras" libraryIcon=":/extrasplugin/images/count-bubble-24.png" version="1.0" requiredImport="com.nokia.extras">
+ </itemlibraryentry>
+ </node>
+ <node name="DatePickerDialog" icon=":/extrasplugin/images/date-picker-16.png">
+ <itemlibraryentry name="DatePickerDialog" category="Components Extras" libraryIcon=":/extrasplugin/images/date-picker-24.png" version="1.0" requiredImport="com.nokia.extras">
+ </itemlibraryentry>
+ </node>
+ <node name="InfoBanner" icon=":/extrasplugin/images/info-banner-16.png">
+ <itemlibraryentry name="InfoBanner" category="Components Extras" libraryIcon=":/extrasplugin/images/info-banner-24.png" version="1.0" requiredImport="com.nokia.extras">
+ </itemlibraryentry>
+ </node>
+ <node name="ListButton" icon=":/extrasplugin/images/list-button-16.png">
+ <itemlibraryentry name="ListButton" category="Components Extras" libraryIcon=":/extrasplugin/images/list-button-24.png" version="1.0" requiredImport="com.nokia.extras">
+ </itemlibraryentry>
+ </node>
+ <node name="ListDelegate" icon=":/extrasplugin/images/list-delegate-16.png">
+ <itemlibraryentry name="ListDelegate" category="Components Extras" libraryIcon=":/extrasplugin/images/list-delegate-24.png" version="1.0" requiredImport="com.nokia.extras">
+ </itemlibraryentry>
+ </node>
+ <node name="MoreIndicator" icon=":/extrasplugin/images/more-indicator-16.png">
+ <itemlibraryentry name="MoreIndicator" category="Components Extras" libraryIcon=":/extrasplugin/images/more-indicator-24.png" version="1.0" requiredImport="com.nokia.extras">
+ </itemlibraryentry>
+ </node>
+ <node name="PageIndicator" icon=":/extrasplugin/images/page-indicator-16.png">
+ <itemlibraryentry name="PageIndicator" category="Components Extras" libraryIcon=":/extrasplugin/images/page-indicator-24.png" version="1.0" requiredImport="com.nokia.extras">
+ </itemlibraryentry>
+ </node>
+ <node name="RatingIndicator" icon=":/extrasplugin/images/rating-indicator-16.png">
+ <itemlibraryentry name="RatingIndicator" category="Components Extras" libraryIcon=":/extrasplugin/images/rating-indicator-24.png" version="1.0" requiredImport="com.nokia.extras">
+ </itemlibraryentry>
+ </node>
+ <node name="TimePickerDialog" icon=":/extrasplugin/images/time-picker-16.png">
+ <itemlibraryentry name="TimePickerDialog" category="Components Extras" libraryIcon=":/extrasplugin/images/time-picker-24.png" version="1.0" requiredImport="com.nokia.extras">
+ </itemlibraryentry>
+ </node>
+ <node name="Tumbler" icon=":/extrasplugin/images/tumbler-16.png">
+ <itemlibraryentry name="Tumbler" category="Components Extras" libraryIcon=":/extrasplugin/images/tumbler-24.png" version="1.0" requiredImport="com.nokia.extras">
+ </itemlibraryentry>
+ </node>
+ <node name="TumblerButton" icon=":/extrasplugin/images/tumbler-button-16.png">
+ <itemlibraryentry name="TumblerButton" category="Components Extras" libraryIcon=":/extrasplugin/images/tumbler-button-24.png" version="1.0" requiredImport="com.nokia.extras">
+ </itemlibraryentry>
+ </node>
+ <node name="TumblerColumn" icon=":/extrasplugin/images/tumbler-column-16.png">
+ <itemlibraryentry name="TumblerColumn" category="Components Extras" libraryIcon=":/extrasplugin/images/tumbler-column-24.png" version="1.0" requiredImport="com.nokia.extras">
+ </itemlibraryentry>
+ </node>
+ <node name="TumblerDialog" icon=":/extrasplugin/images/tumbler-dialog-16.png">
+ <itemlibraryentry name="TumblerDialog" category="Components Extras" libraryIcon=":/extrasplugin/images/tumbler-dialog-24.png" version="1.0" requiredImport="com.nokia.extras">
+ </itemlibraryentry>
+ </node>
+</metainfo>
diff --git a/src/plugins/qmldesigner/extrasplugin/extrasplugin.cpp b/src/plugins/qmldesigner/extrasplugin/extrasplugin.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..f4fd844abbc357713ce39f5b49e7194b03027baf
--- /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 <widgetplugin_helper.h>
+#include <QtCore/QtPlugin>
+
+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 0000000000000000000000000000000000000000..db069308bc1fa3dc37af2ee8ddc89abd0d564598
--- /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 <iwidgetplugin.h>
+#include <QtDeclarative/qdeclarative.h>
+
+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 0000000000000000000000000000000000000000..12f923cb1e5a97d2c58477fdeba8a1f3e322271d
--- /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 0000000000000000000000000000000000000000..8fffeb677613ae05c5cd3101642fe9a522ed71d0
--- /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 0000000000000000000000000000000000000000..ae97ba05e9d13662b0b2339294393f5c4cd68403
--- /dev/null
+++ b/src/plugins/qmldesigner/extrasplugin/extrasplugin.qrc
@@ -0,0 +1,31 @@
+<RCC>
+ <qresource prefix="/extrasplugin">
+ <file>extras.metainfo</file>
+ <file>images/count-bubble-16.png</file>
+ <file>images/count-bubble-24.png</file>
+ <file>images/date-picker-16.png</file>
+ <file>images/date-picker-24.png</file>
+ <file>images/info-banner-16.png</file>
+ <file>images/info-banner-24.png</file>
+ <file>images/list-button-16.png</file>
+ <file>images/list-button-24.png</file>
+ <file>images/list-delegate-16.png</file>
+ <file>images/list-delegate-24.png</file>
+ <file>images/more-indicator-16.png</file>
+ <file>images/more-indicator-24.png</file>
+ <file>images/page-indicator-16.png</file>
+ <file>images/page-indicator-24.png</file>
+ <file>images/rating-indicator-16.png</file>
+ <file>images/rating-indicator-24.png</file>
+ <file>images/time-picker-16.png</file>
+ <file>images/time-picker-24.png</file>
+ <file>images/tumbler-16.png</file>
+ <file>images/tumbler-24.png</file>
+ <file>images/tumbler-button-16.png</file>
+ <file>images/tumbler-button-24.png</file>
+ <file>images/tumbler-column-16.png</file>
+ <file>images/tumbler-column-24.png</file>
+ <file>images/tumbler-dialog-16.png</file>
+ <file>images/tumbler-dialog-24.png</file>
+ </qresource>
+</RCC>
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 0000000000000000000000000000000000000000..2ac1430602d680eebceb95d7f12388f8cd72b381
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 0000000000000000000000000000000000000000..ba444822d51e7328c2a7562493784ca814576a2f
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 0000000000000000000000000000000000000000..b8eb95b737a6dba0bc12e244df22c7ea60926e29
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 0000000000000000000000000000000000000000..a8ee7e084736549cea0cebef2698eff4c66251bb
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 0000000000000000000000000000000000000000..379413808bc9fbfa93159679cf4c5df6ceaf44ab
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 0000000000000000000000000000000000000000..bf8aa614d0ac4a4fc6391bfec3d50177779089c4
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 0000000000000000000000000000000000000000..2b1ce900b82a740887ed71ee30dbe7f72978dfbc
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 0000000000000000000000000000000000000000..d432090f9cabe4b5cc9509b325eccab7696f852c
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 0000000000000000000000000000000000000000..3c97433f087882392f02284ce0da26964153998d
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 0000000000000000000000000000000000000000..c4d98869206f5a2bf3d2f0d7fc7ad75d1524b94b
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 0000000000000000000000000000000000000000..81eff7306c917384d9996d1adb1ad3c06b38af08
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 0000000000000000000000000000000000000000..f5d8dedbfbae1a953e5256f52d5f70c07c063d54
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 0000000000000000000000000000000000000000..29a89337514afffe2ac7dc6df59207f67c45f417
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 0000000000000000000000000000000000000000..60dda334fc5739ec18f052b09ab6944e24c15bf0
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 0000000000000000000000000000000000000000..2df5418a848d1f2164092c3c0425f5d096c86848
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 0000000000000000000000000000000000000000..393b2ffa6957a7f0d5b0554cb4034b48e2dcf9ae
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 0000000000000000000000000000000000000000..1ee49cafbd516a65e2987b48bb75f39214155c4f
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 0000000000000000000000000000000000000000..979981bd3184c135c6eca52b35f2ff31fccbb017
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 0000000000000000000000000000000000000000..afcf864744d2f0ceb18a061a40e3107795134765
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 0000000000000000000000000000000000000000..43783e6ee236024b7912a6a6a981b120e459bf8b
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 0000000000000000000000000000000000000000..4368493c3e775215074b5b2940df0a613c0bfd7f
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 0000000000000000000000000000000000000000..6b0b71a65af290a6b250a54ea405717343c982b6
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 0000000000000000000000000000000000000000..36e2d27608e60c07f7c94e626abbd621e96ddc9b
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 0000000000000000000000000000000000000000..8a043798f1c4e45f15dcb89ba15c705bb7c93bc2
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 0000000000000000000000000000000000000000..5a105a76db9de467afbd18894cb96a1e5ba323c9
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 0000000000000000000000000000000000000000..a6bbc2d795e2ca3110854746bd850c6220771bfb
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 0000000000000000000000000000000000000000..24f0c19b72b42e31ad229db03956a15da2cc42f4
--- /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 1c1a3735f31bcbbb1e102451869762d32ec3d2b9..bab7341b1f4a06460450a76d7dc9800e4c363d8b 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