Merge remote-tracking branch 'origin/2.6'

64 files changed, 6 insertions, 818 deletions

diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
index e39240df30..f088b25e6e 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
@@ -266,8 +266,6 @@ void ItemLibraryWidget::updateImports()
         foreach (const Import &import, d->model->imports())
             if (import.isLibraryImport())
                 imports << import.url();
-        if (imports.contains("com.nokia.symbian", Qt::CaseInsensitive))
-            filter = Symbian;
         if (imports.contains("com.nokia.meego", Qt::CaseInsensitive))
             filter = Meego;
     }
@@ -290,23 +288,16 @@ QList<QToolButton *> ItemLibraryWidget::createToolBarWidgets()
     QAction * basicQtAction = new QAction(menu);
     basicQtAction->setCheckable(true);
     basicQtAction->setText("Basic Qt Quick only");
-    QAction * symbianAction = new QAction(menu);
-    symbianAction->setCheckable(true);
-    symbianAction->setText("Symbian Components");
     QAction * meegoAction= new QAction(menu);
     meegoAction->setCheckable(true);
     meegoAction->setText("Meego Components");
     menu->addAction(basicQtAction);
     menu->addAction(meegoAction);
-    menu->addAction(symbianAction);
     buttons.first()->setMenu(menu);
 
     connect(basicQtAction, SIGNAL(toggled(bool)), this, SLOT(onQtBasicOnlyChecked(bool)));
     connect(this, SIGNAL(qtBasicOnlyChecked(bool)), basicQtAction, SLOT(setChecked(bool)));
 
-    connect(symbianAction, SIGNAL(toggled(bool)), this, SLOT(onSymbianChecked(bool)));
-    connect(this, SIGNAL(symbianChecked(bool)), symbianAction, SLOT(setChecked(bool)));
-
     connect(meegoAction, SIGNAL(toggled(bool)), this, SLOT(onMeegoChecked(bool)));
     connect(this, SIGNAL(meegoChecked(bool)), meegoAction, SLOT(setChecked(bool)));
 
@@ -355,7 +346,6 @@ void ItemLibraryWidget::emitImportChecked()
 
     bool qtOnlyImport = false;
     bool meegoImport = false;
-    bool symbianImport = false;
 
     foreach (const Import &import, d->model->imports()) {
         if (import.isLibraryImport()) {
@@ -363,17 +353,14 @@ void ItemLibraryWidget::emitImportChecked()
                 meegoImport = true;
             if (import.url().contains(QString("Qt"), Qt::CaseInsensitive) || import.url().contains(QString("QtQuick"), Qt::CaseInsensitive))
                 qtOnlyImport = true;
-            if (import.url().contains(QString("symbian"), Qt::CaseInsensitive))
-                symbianImport = true;
         }
     }
 
-    if (meegoImport || symbianImport)
+    if (meegoImport)
         qtOnlyImport = false;
 
     emit qtBasicOnlyChecked(qtOnlyImport);
     emit meegoChecked(meegoImport);
-    emit symbianChecked(symbianImport);
 }
 
 void ItemLibraryWidget::setImportFilter(FilterChangeFlag flag)
@@ -395,16 +382,10 @@ void ItemLibraryWidget::setImportFilter(FilterChangeFlag flag)
     QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
     try {
         block = true;
-        if (flag == QtBasic) {
-            removeImport(QLatin1String("com.nokia.meego"));
-            removeImport(QLatin1String("com.nokia.symbian"));
-        } else  if (flag == Symbian) {
+        if (flag == QtBasic)
             removeImport(QLatin1String("com.nokia.meego"));
-            addImport(QLatin1String("com.nokia.symbian"), QLatin1String("1.0"));
-        }  else  if (flag == Meego) {
-            removeImport(QLatin1String("com.nokia.symbian"));
+        else if (flag == Meego)
             addImport(QLatin1String("com.nokia.meego"), QLatin1String("1.0"));
-        }
         QApplication::restoreOverrideCursor();
         block = false;
         m_filterFlag = flag;
@@ -431,14 +412,6 @@ void ItemLibraryWidget::onMeegoChecked(bool b)
         setImportFilter(Meego);
 }
 
-void ItemLibraryWidget::onSymbianChecked(bool b)
-{
-    if (b)
-        setImportFilter(Symbian);
-}
-
-
-
 void ItemLibraryWidget::updateModel()
 {
     d->m_itemLibraryModel->update(d->m_itemLibraryInfo.data(), d->model);
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h
index dd0b96d3a9..b2b76eb080 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h
@@ -48,8 +48,7 @@ class ItemLibraryWidget : public QFrame
 
     enum FilterChangeFlag {
       QtBasic = 0x0,
-      Meego = 0x1,
-      Symbian = 0x2
+      Meego = 0x1
     };
 
 public:
@@ -77,7 +76,6 @@ public Q_SLOTS:
 
     void onQtBasicOnlyChecked(bool b);
     void onMeegoChecked(bool b);
-    void onSymbianChecked(bool b);
 
 protected:
     void wheelEvent(QWheelEvent *event);
@@ -91,7 +89,6 @@ signals:
     void resetItemsView();
     void qtBasicOnlyChecked(bool b);
     void meegoChecked(bool b);
-    void symbianChecked(bool b);
 
 private:
     ItemLibraryWidgetPrivate *d;
diff --git a/src/plugins/qmldesigner/components/themeloader/qts60stylethemeio.cpp b/src/plugins/qmldesigner/components/themeloader/qts60stylethemeio.cpp
deleted file mode 100644
index ab65b01fce..0000000000
--- a/src/plugins/qmldesigner/components/themeloader/qts60stylethemeio.cpp
+++ /dev/null
@@ -1,358 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: http://www.qt-project.org/
-**
-**
-** 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.
-**
-** 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.
-**
-**
-**************************************************************************/
-
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the $MODULE$ of the Qt Toolkit.
-**
-** $TROLLTECH_DUAL_LICENSE$
-**
-****************************************************************************/
-
-#include "qts60stylethemeio.h"
-
-#if !defined(QT_NO_STYLE_S60)
-
-#include "qs60style.h"
-#include "qapplication.h"
-#include "qwebview.h"
-#include "qwebframe.h"
-#include "qeventloop.h"
-#include "qpicture.h"
-#include "qpicture.h"
-#include "qpainter.h"
-#include "qfile.h"
-#include "qdir.h"
-#include "qfileinfo.h"
-#include "qxmlstream.h"
-#include "qbuffer.h"
-
-#include "qdebug.h"
-
-static const quint32 blobVersion = 1;
-static const int pictureSize = 256;
-
-void dumpPartPictures(const QHash<QString, QPicture> &partPictures) {
-    foreach (const QString &partKey, partPictures.keys()) {
-        QPicture partPicture = partPictures.value(partKey);
-        qDebug() << partKey << partPicture.boundingRect();
-        QImage image(partPicture.boundingRect().size(), QImage::Format_ARGB32);
-        image.fill(Qt::transparent);
-        QPainter p(&image);
-        partPicture.play(&p);
-        image.save(partKey + QString::fromLatin1(".png"));
-    }
-}
-
-void dumpColors(const QHash<QPair<QString, int>, QColor> &colors) {
-    foreach (const QColor &color, colors.values()) {
-        const QPair<QString, int> key = colors.key(color);
-        qDebug() << key << color;
-    }
-}
-
-bool setS60Theme(QHash<QString, QPicture> &partPictures,
-        QHash<QPair<QString, int>, QColor> &colors,
-        QS60Style *s60Style)
-{
-    if (!s60Style)
-        s60Style = qobject_cast<QS60Style *>(QApplication::style());
-    if (!s60Style || !qobject_cast<QS60Style *>(s60Style)) {
-        qWarning() << __FUNCTION__ << ": No QS60Style found.";
-        return false;
-    }
-    s60Style->setS60Theme(partPictures, colors);
-    return true;
-}
-
-#ifndef QT_NO_WEBKIT
-class WebKitSVGRenderer : public QWebView
-{
-    Q_OBJECT
-
-public:
-    WebKitSVGRenderer(QWidget *parent = 0);
-    QPicture svgToQPicture(const QString &svgFileName);
-
-private slots:
-    void loadFinishedSlot(bool ok);
-
-private:
-    QEventLoop m_loop;
-    QPicture m_result;
-};
-
-WebKitSVGRenderer::WebKitSVGRenderer(QWidget *parent)
-    : QWebView(parent)
-{
-    connect(this, SIGNAL(loadFinished(bool)), SLOT(loadFinishedSlot(bool)));
-    setFixedSize(pictureSize, pictureSize);
-    QPalette pal = palette();
-    pal.setColor(QPalette::Base, Qt::transparent);
-    setPalette(pal);
-}
-
-QPicture WebKitSVGRenderer::svgToQPicture(const QString &svgFileName)
-{
-    load(QUrl::fromLocalFile(svgFileName));
-    m_loop.exec();
-    return m_result;
-}
-
-void WebKitSVGRenderer::loadFinishedSlot(bool ok)
-{
-    // crude error-checking
-    if (!ok)
-        qDebug() << "Failed loading " << qPrintable(url().toString());
-
-    page()->mainFrame()->evaluateJavaScript(
-        "document.rootElement.preserveAspectRatio.baseVal.align = SVGPreserveAspectRatio.SVG_PRESERVEASPECTRATIO_NONE;"
-        "document.rootElement.style.width = '100%';"
-        "document.rootElement.style.height = '100%';"
-        "document.rootElement.width.baseVal.newValueSpecifiedUnits(SVGLength.SVG_LENGTHTYPE_PERCENTAGE, 100);"
-        "document.rootElement.height.baseVal.newValueSpecifiedUnits(SVGLength.SVG_LENGTHTYPE_PERCENTAGE, 100);"
-    );
-
-    m_result = QPicture(); // "Clear"
-    QPainter p(&m_result);
-    page()->mainFrame()->render(&p);
-    p.end();
-    m_result.setBoundingRect(QRect(0, 0, pictureSize, pictureSize));
-
-    m_loop.exit();
-}
-
-bool parseTdfFile(const QString &tdfFile,
-        QHash<QString, QString> &partSvgs,
-        QHash<QPair<QString, int>, QColor> &colors)
-{
-    const QLatin1String elementKey("element");
-    const QLatin1String partKey("part");
-    const QLatin1String elementIdKey("id");
-    const QLatin1String layerKey("layer");
-    const QLatin1String layerFileNameKey("filename");
-    const QLatin1String layerColourrgbKey("colourrgb");
-    const QString annoyingPrefix("S60_2_6%");
-    QFile file(tdfFile);
-    if (!file.open(QIODevice::ReadOnly))
-        return false;
-    QXmlStreamReader reader(&file);
-    QString partId;
-    QPair<QString, int> colorId;
-    // Somebody with a sense of aesthetics may implement proper XML parsing, here.
-    while (!reader.atEnd()) {
-        const QXmlStreamReader::TokenType token = reader.readNext();
-        switch (token) {
-            case QXmlStreamReader::StartElement:
-                if (reader.name() == elementKey || reader.name() == partKey) {
-                    QString id = reader.attributes().value(elementIdKey).toString();
-                    if (QS60Style::partKeys().contains(id)) {
-                        partId = id;
-                    } else if (!id.isEmpty() && id.at(id.length()-1).isDigit()) {
-                        QString idText = id;
-                        idText.remove(QRegExp("[0-9]"));
-                        if (QS60Style::colorListKeys().contains(idText)) {
-                            QString idNumber = id;
-                            idNumber.remove(QRegExp("[a-zA-Z]"));
-                            colorId = QPair<QString, int>(idText, idNumber.toInt());
-                        }
-                    } else if (QS60Style::partKeys().contains(id.mid(annoyingPrefix.length()))) {
-                        partId = id.mid(annoyingPrefix.length());
-                    }
-                } else if (reader.name() == layerKey) {
-                    if (!partId.isEmpty()) {
-                        const QString svgFile = reader.attributes().value(layerFileNameKey).toString();
-                        partSvgs.insert(partId, svgFile);
-                        partId.clear();
-                    } else if (!colorId.first.isEmpty()) {
-                        const QColor colorValue(reader.attributes().value(layerColourrgbKey).toString().toInt(NULL, 16));
-                        colors.insert(colorId, colorValue);
-                        colorId.first.clear();
-                    }
-                }
-                break;
-            case QXmlStreamReader::EndElement:
-                if (reader.tokenString() == elementKey || reader.name() == partKey)
-                    partId.clear();
-                break;
-            default:
-                break;
-        }
-    }
-    return true;
-}
-
-bool loadThemeFromTdf(const QString &tdfFile,
-        QHash<QString, QPicture> &partPictures,
-        QHash<QPair<QString, int>, QColor> &colors)
-{
-    QHash<QString, QString> parsedPartSvgs;
-    QHash<QString, QPicture> parsedPartPictures;
-    QHash<QPair<QString, int>, QColor> parsedColors;
-    bool success = parseTdfFile(tdfFile, parsedPartSvgs, parsedColors);
-    if (!success)
-        return false;
-    const QString tdfBasePath = QFileInfo(tdfFile).absolutePath();
-    WebKitSVGRenderer renderer;
-    foreach(const QString& partKey, parsedPartSvgs.keys()) {
-        const QString tdfFullName =
-            tdfBasePath + QDir::separator() + parsedPartSvgs.value(partKey);
-        if (!QFile(tdfFullName).exists())
-            qWarning() << "Could not load part " << tdfFullName;
-        const QPicture partPicture = renderer.svgToQPicture(tdfFullName);
-        parsedPartPictures.insert(partKey, partPicture);
-    }
-//    dumpPartPictures(parsedPartPictures);
-//    dumpColors(colors);
-    partPictures = parsedPartPictures;
-    colors = parsedColors;
-    return true;
-}
-
-bool QtS60StyleThemeIO::loadThemeFromTdf(const QString &themeTdf, QS60Style *s60Style)
-{
-    QHash<QString, QPicture> partPictures;
-    QHash<QPair<QString, int>, QColor> colors;
-
-    if (!::loadThemeFromTdf(themeTdf, partPictures, colors))
-        return false;
-
-    return ::setS60Theme(partPictures, colors, s60Style);
-}
-
-bool QtS60StyleThemeIO::convertTdfToBlob(const QString &themeTdf, const QString &themeBlob)
-{
-    QHash<QString, QPicture> partPictures;
-    QHash<QPair<QString, int>, QColor> colors;
-
-    if (!::loadThemeFromTdf(themeTdf, partPictures, colors))
-        return false;
-
-    QFile blob(themeBlob);
-    if (!blob.open(QIODevice::WriteOnly)) {
-        qWarning() << __FUNCTION__ << ": Could not create blob: " << themeBlob;
-        return false;
-    }
-
-    QByteArray data;
-    QBuffer dataBuffer(&data);
-    dataBuffer.open(QIODevice::WriteOnly);
-    QDataStream dataOut(&dataBuffer);
-
-    const int colorsCount = colors.count();
-    dataOut << colorsCount;
-    const QList<QPair<QString, int> > colorKeys = colors.keys();
-    for (int i = 0; i < colorsCount; ++i) {
-        const QPair<QString, int> &key = colorKeys.at(i);
-        dataOut << key;
-        const QColor color = colors.value(key);
-        dataOut << color;
-    }
-
-    const int picturesCount = partPictures.count();
-    dataOut << picturesCount;
-    foreach (const QString &key, partPictures.keys()) {
-        const QPicture picture = partPictures.value(key);
-        dataOut << key;
-        dataOut << picture;
-    }
-
-    QDataStream blobOut(&blob);
-    blobOut << blobVersion;
-    blobOut << qCompress(data);
-    return blobOut.status() == QDataStream::Ok;
-}
-#endif // !QT_NO_WEBKIT
-
-bool QtS60StyleThemeIO::loadThemeFromBlob(const QString &themeBlob, QS60Style *s60Style)
-{
-    QHash<QString, QPicture> partPictures;
-    QHash<QPair<QString, int>, QColor> colors;
-
-    QFile blob(themeBlob);
-    if (!blob.open(QIODevice::ReadOnly)) {
-        qWarning() << __FUNCTION__ << ": Could not read blob: " << themeBlob;
-        return false;
-    }
-    QDataStream blobIn(&blob);
-
-    quint32 version;
-    blobIn >> version;
-
-    if (version != blobVersion) {
-        qWarning() << __FUNCTION__ << ": Invalid blob version: " << version << " ...expected: " << blobVersion;
-        return false;
-    }
-
-    QByteArray data;
-    blobIn >> data;
-    data = qUncompress(data);
-    QBuffer dataBuffer(&data);
-    dataBuffer.open(QIODevice::ReadOnly);
-    QDataStream dataIn(&dataBuffer);
-
-    int colorsCount;
-    dataIn >> colorsCount;
-    for (int i = 0; i < colorsCount; ++i) {
-        QPair<QString, int> key;
-        dataIn >> key;
-        QColor value;
-        dataIn >> value;
-        colors.insert(key, value);
-    }
-
-    int picturesCount;
-    dataIn >> picturesCount;
-    for (int i = 0; i < picturesCount; ++i) {
-        QString key;
-        dataIn >> key;
-        QPicture value;
-        dataIn >> value;
-        value.setBoundingRect(QRect(0, 0, pictureSize, pictureSize)); // Bug? The forced bounding rect was not deserialized.
-        partPictures.insert(key, value);
-    }
-
-    if (dataIn.status() != QDataStream::Ok) {
-        qWarning() << __FUNCTION__ << ": Invalid data blob: " << themeBlob;
-        return false;
-    }
-
-//    dumpPartPictures(partPictures);
-//    dumpColors(colors);
-
-    return ::setS60Theme(partPictures, colors, s60Style);
-}
-
-#include "qts60stylethemeio.moc"
-
-#endif // QT_NO_STYLE_S60
diff --git a/src/plugins/qmldesigner/components/themeloader/qts60stylethemeio.h b/src/plugins/qmldesigner/components/themeloader/qts60stylethemeio.h
deleted file mode 100644
index 4a606355c7..0000000000
--- a/src/plugins/qmldesigner/components/themeloader/qts60stylethemeio.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: http://www.qt-project.org/
-**
-**
-** 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.
-**
-** 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.
-**
-**
-**************************************************************************/
-
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the $MODULE$ of the Qt Toolkit.
-**
-** $TROLLTECH_DUAL_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QTS60STYLETHEMEIO_H
-#define QTS60STYLETHEMEIO_H
-
-#include "qstring.h"
-
-class QS60Style;
-
-class QtS60StyleThemeIO
-{
-public:
-    static bool loadThemeFromBlob(const QString &themeBlob, QS60Style *s60Style = 0);
-#ifndef QT_NO_WEBKIT
-    static bool loadThemeFromTdf(const QString &themeTdf, QS60Style *s60Style = 0);
-    static bool convertTdfToBlob(const QString &themeTdf, const QString &themeBlob);
-#endif
-};
-
-#endif // QTS60STYLETHEMEIO_H
diff --git a/src/plugins/qmldesigner/components/themeloader/qts60stylethemeio.pri b/src/plugins/qmldesigner/components/themeloader/qts60stylethemeio.pri
deleted file mode 100644
index ec800883be..0000000000
--- a/src/plugins/qmldesigner/components/themeloader/qts60stylethemeio.pri
+++ /dev/null
@@ -1,6 +0,0 @@
-contains(QT_CONFIG, webkit) {
-    QT += webkit
-}
-#SOURCES += $$PWD/qts60stylethemeio.cpp
-#INCLUDE += $$PWD/qts60stylethemeio.h
-#INCLUDEPATH += $$PWD
diff --git a/src/plugins/qmldesigner/config.pri b/src/plugins/qmldesigner/config.pri
index 24a75f2553..f10396351d 100644
--- a/src/plugins/qmldesigner/config.pri
+++ b/src/plugins/qmldesigner/config.pri
@@ -1,6 +1,4 @@
 # MOC_DIR = moc
-DEFINES += QT_NO_STYLE_S60
-
 debug {
   DEFINES += VIEWLOGGER
 }
diff --git a/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.pri b/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.pri
index d0b68ece2a..3d857270a4 100644
--- a/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.pri
+++ b/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.pri
@@ -7,7 +7,6 @@ QT += script \
 
 include (../designercore/iwidgetplugin.pri)
 
-DEFINES += SYMBIAN_LIBRARY
 SOURCES += $$PWD/customstyleplugin.cpp
 
 HEADERS += $$PWD/customstyleplugin.h  $$PWD/../designercore/include/iwidgetplugin.h
diff --git a/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp b/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
index 02f1201bba..8377112d39 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
@@ -59,7 +59,7 @@ static inline QStringList importPaths() {
     // env import paths
     QByteArray envImportPath = qgetenv("QML_IMPORT_PATH");
     if (!envImportPath.isEmpty()) {
-#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
+#if defined(Q_OS_WIN)
         QLatin1Char pathSep(';');
 #else
         QLatin1Char pathSep(':');
diff --git a/src/plugins/qmldesigner/desktopplugin/desktopplugin.pri b/src/plugins/qmldesigner/desktopplugin/desktopplugin.pri
index 302272967e..ec6277c618 100644
--- a/src/plugins/qmldesigner/desktopplugin/desktopplugin.pri
+++ b/src/plugins/qmldesigner/desktopplugin/desktopplugin.pri
@@ -7,7 +7,6 @@ QT += script \
 
 include (../designercore/iwidgetplugin.pri)
 
-DEFINES += SYMBIAN_LIBRARY
 SOURCES += $$PWD/desktopplugin.cpp
 
 HEADERS += $$PWD/desktopplugin.h  $$PWD/../designercore/include/iwidgetplugin.h
diff --git a/src/plugins/qmldesigner/extrasplugin/extrasplugin.pri b/src/plugins/qmldesigner/extrasplugin/extrasplugin.pri
index 12f923cb1e..3faaed83f3 100644
--- a/src/plugins/qmldesigner/extrasplugin/extrasplugin.pri
+++ b/src/plugins/qmldesigner/extrasplugin/extrasplugin.pri
@@ -7,7 +7,6 @@ QT += script \
 
 include (../designercore/iwidgetplugin.pri)
 
-DEFINES += SYMBIAN_LIBRARY
 SOURCES += $$PWD/extrasplugin.cpp
 
 HEADERS += $$PWD/extrasplugin.h  $$PWD/../designercore/include/iwidgetplugin.h
diff --git a/src/plugins/qmldesigner/meegoplugin/meegoplugin.pri b/src/plugins/qmldesigner/meegoplugin/meegoplugin.pri
index 04abc89874..d457b3c413 100644
--- a/src/plugins/qmldesigner/meegoplugin/meegoplugin.pri
+++ b/src/plugins/qmldesigner/meegoplugin/meegoplugin.pri
@@ -7,7 +7,6 @@ QT += script \
 
 include (../designercore/iwidgetplugin.pri)
 
-DEFINES += SYMBIAN_LIBRARY
 SOURCES += $$PWD/meegoplugin.cpp
 
 HEADERS += $$PWD/meegoplugin.h  $$PWD/../designercore/include/iwidgetplugin.h
diff --git a/src/plugins/qmldesigner/qmldesigner.pro b/src/plugins/qmldesigner/qmldesigner.pro
index 40bb44a19d..35d3d36990 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 extrasplugin desktopplugin customstyleplugin
+SUBDIRS   = qmldesignerplugin.pro qtquickplugin meegoplugin extrasplugin desktopplugin customstyleplugin
diff --git a/src/plugins/qmldesigner/qmldesignerplugin.pro b/src/plugins/qmldesigner/qmldesignerplugin.pro
index fcac4a10ad..d042701c19 100644
--- a/src/plugins/qmldesigner/qmldesignerplugin.pro
+++ b/src/plugins/qmldesigner/qmldesignerplugin.pro
@@ -16,7 +16,6 @@ include(components/formeditor/formeditor.pri)
 include(components/itemlibrary/itemlibrary.pri)
 include(components/navigator/navigator.pri)
 include(components/pluginmanager/pluginmanager.pri)
-include(components/themeloader/qts60stylethemeio.pri)
 include(components/stateseditor/stateseditor.pri)
 include(components/resources/resources.pri)
 
diff --git a/src/plugins/qmldesigner/symbianplugin/images/Untitled-2.png b/src/plugins/qmldesigner/symbianplugin/images/Untitled-2.png
deleted file mode 100644
index 2e0bf73a26..0000000000
--- a/src/plugins/qmldesigner/symbianplugin/images/Untitled-2.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/symbianplugin/images/busyindicator.png b/src/plugins/qmldesigner/symbianplugin/images/busyindicator.png
deleted file mode 100644
index 89d0283f26..0000000000
--- a/src/plugins/qmldesigner/symbianplugin/images/busyindicator.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/symbianplugin/images/busyindicator16.png b/src/plugins/qmldesigner/symbianplugin/images/busyindicator16.png
deleted file mode 100644
index 7e3b2d3158..0000000000
--- a/src/plugins/qmldesigner/symbianplugin/images/busyindicator16.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/symbianplugin/images/busyindicatora.png b/src/plugins/qmldesigner/symbianplugin/images/busyindicatora.png
deleted file mode 100644
index 433f4d426b..0000000000
--- a/src/plugins/qmldesigner/symbianplugin/images/busyindicatora.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/symbianplugin/images/busyindicatora16.png b/src/plugins/qmldesigner/symbianplugin/images/busyindicatora16.png
deleted file mode 100644
index 82de5b0a1b..0000000000
--- a/src/plugins/qmldesigner/symbianplugin/images/busyindicatora16.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/symbianplugin/images/button.png b/src/plugins/qmldesigner/symbianplugin/images/button.png
deleted file mode 100644
index 828af210ac..0000000000
--- a/src/plugins/qmldesigner/symbianplugin/images/button.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/symbianplugin/images/button16.png b/src/plugins/qmldesigner/symbianplugin/images/button16.png
deleted file mode 100644
index 8d95760b27..0000000000
--- a/src/plugins/qmldesigner/symbianplugin/images/button16.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/symbianplugin/images/buttoncolumn.png b/src/plugins/qmldesigner/symbianplugin/images/buttoncolumn.png
deleted file mode 100644
index 46db8f6ab5..0000000000
--- a/src/plugins/qmldesigner/symbianplugin/images/buttoncolumn.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/symbianplugin/images/buttoncolumn16.png b/src/plugins/qmldesigner/symbianplugin/images/buttoncolumn16.png
deleted file mode 100644
index 883258048f..0000000000
--- a/src/plugins/qmldesigner/symbianplugin/images/buttoncolumn16.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/symbianplugin/images/buttonrow.png b/src/plugins/qmldesigner/symbianplugin/images/buttonrow.png
deleted file mode 100644
index 9727749de9..0000000000
--- a/src/plugins/qmldesigner/symbianplugin/images/buttonrow.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/symbianplugin/images/buttonrow16.png b/src/plugins/qmldesigner/symbianplugin/images/buttonrow16.png
deleted file mode 100644
index 420de41860..0000000000
--- a/src/plugins/qmldesigner/symbianplugin/images/buttonrow16.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/symbianplugin/images/checkbox.png b/src/plugins/qmldesigner/symbianplugin/images/checkbox.png
deleted file mode 100644
index 0f4a826f4d..0000000000
--- a/src/plugins/qmldesigner/symbianplugin/images/checkbox.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/symbianplugin/images/checkbox16.png b/src/plugins/qmldesigner/symbianplugin/images/checkbox16.png
deleted file mode 100644
index 01f09e3515..0000000000
--- a/src/plugins/qmldesigner/symbianplugin/images/checkbox16.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/symbianplugin/images/choicelist.png b/src/plugins/qmldesigner/symbianplugin/images/choicelist.png
deleted file mode 100644
index 3fd9876ada..0000000000
--- a/src/plugins/qmldesigner/symbianplugin/images/choicelist.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/symbianplugin/images/choicelist16.png b/src/plugins/qmldesigner/symbianplugin/images/choicelist16.png
deleted file mode 100644
index 602b28229e..0000000000
--- a/src/plugins/qmldesigner/symbianplugin/images/choicelist16.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/symbianplugin/images/item-icon.png b/src/plugins/qmldesigner/symbianplugin/images/item-icon.png
deleted file mode 100644
index fc53d38ae7..0000000000
--- a/src/plugins/qmldesigner/symbianplugin/images/item-icon.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/symbianplugin/images/item-icon16.png b/src/plugins/qmldesigner/symbianplugin/images/item-icon16.png
deleted file mode 100644
index 7d2d7a5050..0000000000
--- a/src/plugins/qmldesigner/symbianplugin/images/item-icon16.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/symbianplugin/images/listview-icon.png b/src/plugins/qmldesigner/symbianplugin/images/listview-icon.png
deleted file mode 100644
index 9c1327373d..0000000000
--- a/src/plugins/qmldesigner/symbianplugin/images/listview-icon.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/symbianplugin/images/listview-icon16.png b/src/plugins/qmldesigner/symbianplugin/images/listview-icon16.png
deleted file mode 100644
index 1deac24a2a..0000000000
--- a/src/plugins/qmldesigner/symbianplugin/images/listview-icon16.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/symbianplugin/images/progressbar.png b/src/plugins/qmldesigner/symbianplugin/images/progressbar.png
deleted file mode 100644
index 040f5bac03..0000000000
--- a/src/plugins/qmldesigner/symbianplugin/images/progressbar.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/symbianplugin/images/progressbar16.png b/src/plugins/qmldesigner/symbianplugin/images/progressbar16.png
deleted file mode 100644
index e2432475d5..0000000000
--- a/src/plugins/qmldesigner/symbianplugin/images/progressbar16.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/symbianplugin/images/radiobutton.png b/src/plugins/qmldesigner/symbianplugin/images/radiobutton.png
deleted file mode 100644
index 143b6a99f4..0000000000
--- a/src/plugins/qmldesigner/symbianplugin/images/radiobutton.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/symbianplugin/images/radiobutton16.png b/src/plugins/qmldesigner/symbianplugin/images/radiobutton16.png
deleted file mode 100644
index 94912c2034..0000000000
--- a/src/plugins/qmldesigner/symbianplugin/images/radiobutton16.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/symbianplugin/images/slider.png b/src/plugins/qmldesigner/symbianplugin/images/slider.png
deleted file mode 100644
index 746ed51932..0000000000
--- a/src/plugins/qmldesigner/symbianplugin/images/slider.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/symbianplugin/images/slider16.png b/src/plugins/qmldesigner/symbianplugin/images/slider16.png
deleted file mode 100644
index 10c4928b3c..0000000000
--- a/src/plugins/qmldesigner/symbianplugin/images/slider16.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/symbianplugin/images/sliderh.png b/src/plugins/qmldesigner/symbianplugin/images/sliderh.png
deleted file mode 100644
index 87cd55678f..0000000000
--- a/src/plugins/qmldesigner/symbianplugin/images/sliderh.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/symbianplugin/images/sliderh16.png b/src/plugins/qmldesigner/symbianplugin/images/sliderh16.png
deleted file mode 100644
index c419911336..0000000000
--- a/src/plugins/qmldesigner/symbianplugin/images/sliderh16.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/symbianplugin/images/statusbar.png b/src/plugins/qmldesigner/symbianplugin/images/statusbar.png
deleted file mode 100644
index ebd0775a88..0000000000
--- a/src/plugins/qmldesigner/symbianplugin/images/statusbar.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/symbianplugin/images/statusbar16.png b/src/plugins/qmldesigner/symbianplugin/images/statusbar16.png
deleted file mode 100644
index fec4585dce..0000000000
--- a/src/plugins/qmldesigner/symbianplugin/images/statusbar16.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/symbianplugin/images/switchbutton.png b/src/plugins/qmldesigner/symbianplugin/images/switchbutton.png
deleted file mode 100644
index 48bf247cb8..0000000000
--- a/src/plugins/qmldesigner/symbianplugin/images/switchbutton.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/symbianplugin/images/switchbutton16.png b/src/plugins/qmldesigner/symbianplugin/images/switchbutton16.png
deleted file mode 100644
index 238a1be632..0000000000
--- a/src/plugins/qmldesigner/symbianplugin/images/switchbutton16.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/symbianplugin/images/tabbar.png b/src/plugins/qmldesigner/symbianplugin/images/tabbar.png
deleted file mode 100644
index 2f44e62b3f..0000000000
--- a/src/plugins/qmldesigner/symbianplugin/images/tabbar.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/symbianplugin/images/tabbar16.png b/src/plugins/qmldesigner/symbianplugin/images/tabbar16.png
deleted file mode 100644
index 57c7906982..0000000000
--- a/src/plugins/qmldesigner/symbianplugin/images/tabbar16.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/symbianplugin/images/tabbutton.png b/src/plugins/qmldesigner/symbianplugin/images/tabbutton.png
deleted file mode 100644
index d9f5fdb3f9..0000000000
--- a/src/plugins/qmldesigner/symbianplugin/images/tabbutton.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/symbianplugin/images/tabbutton16.png b/src/plugins/qmldesigner/symbianplugin/images/tabbutton16.png
deleted file mode 100644
index 8e279cff65..0000000000
--- a/src/plugins/qmldesigner/symbianplugin/images/tabbutton16.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/symbianplugin/images/textarea.png b/src/plugins/qmldesigner/symbianplugin/images/textarea.png
deleted file mode 100644
index 86f2969d00..0000000000
--- a/src/plugins/qmldesigner/symbianplugin/images/textarea.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/symbianplugin/images/textarea16.png b/src/plugins/qmldesigner/symbianplugin/images/textarea16.png
deleted file mode 100644
index 899a4bca2e..0000000000
--- a/src/plugins/qmldesigner/symbianplugin/images/textarea16.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/symbianplugin/images/textfield.png b/src/plugins/qmldesigner/symbianplugin/images/textfield.png
deleted file mode 100644
index b0f13da50d..0000000000
--- a/src/plugins/qmldesigner/symbianplugin/images/textfield.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/symbianplugin/images/textfield16.png b/src/plugins/qmldesigner/symbianplugin/images/textfield16.png
deleted file mode 100644
index 7feb8c7158..0000000000
--- a/src/plugins/qmldesigner/symbianplugin/images/textfield16.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/symbianplugin/images/toolbar.png b/src/plugins/qmldesigner/symbianplugin/images/toolbar.png
deleted file mode 100644
index e67c042422..0000000000
--- a/src/plugins/qmldesigner/symbianplugin/images/toolbar.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/symbianplugin/images/toolbar16.png b/src/plugins/qmldesigner/symbianplugin/images/toolbar16.png
deleted file mode 100644
index f4a0c5ef69..0000000000
--- a/src/plugins/qmldesigner/symbianplugin/images/toolbar16.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/symbianplugin/images/window.png b/src/plugins/qmldesigner/symbianplugin/images/window.png
deleted file mode 100644
index fc53d38ae7..0000000000
--- a/src/plugins/qmldesigner/symbianplugin/images/window.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/symbianplugin/images/window16.png b/src/plugins/qmldesigner/symbianplugin/images/window16.png
deleted file mode 100644
index 7d2d7a5050..0000000000
--- a/src/plugins/qmldesigner/symbianplugin/images/window16.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/symbianplugin/source/SymbianListView.qml b/src/plugins/qmldesigner/symbianplugin/source/SymbianListView.qml
deleted file mode 100644
index f9bead4d6b..0000000000
--- a/src/plugins/qmldesigner/symbianplugin/source/SymbianListView.qml
+++ /dev/null
@@ -1,53 +0,0 @@
-import QtQuick 1.0
-import com.nokia.symbian 1.0
-
-ListView {
-    x: 0
-    y: 36
-    width: 360
-    height: 320
-    clip: true
-    header: ListHeading {
-        ListItemText {
-            anchors.fill: parent.paddingItem
-            role: "Heading"
-            text: "ListHeading"
-        }
-    }
-    delegate:    ListItem {
-        id: listItem
-        Column {
-            anchors.fill: parent.paddingItem
-            ListItemText {
-                width: parent.width
-                mode: listItem.mode
-                role: "Title"
-                text: titleText
-            }
-            ListItemText {
-                width: parent.width
-                mode: listItem.mode
-                role: "SubTitle"
-                text: subTitleText
-            }
-        }
-    }
-    model: ListModel {
-        ListElement {
-            titleText: "Title1"
-            subTitleText: "SubTitle1"
-        }
-        ListElement {
-            titleText: "Title2"
-            subTitleText: "SubTitle2"
-        }
-        ListElement {
-            titleText: "Title3"
-            subTitleText: "SubTitle3"
-        }
-        ListElement {
-            titleText: "Title4"
-            subTitleText: "SubTitle4"
-        }
-    }
-}
diff --git a/src/plugins/qmldesigner/symbianplugin/source/ToolBar.qml b/src/plugins/qmldesigner/symbianplugin/source/ToolBar.qml
deleted file mode 100644
index 2bfd94e0e3..0000000000
--- a/src/plugins/qmldesigner/symbianplugin/source/ToolBar.qml
+++ /dev/null
@@ -1,15 +0,0 @@
-import QtQuick 1.0
-import com.nokia.symbian 1.0
-
-ToolBar {
-        tools: ToolBarLayout {
-            ToolButton {
-                flat: true
-                iconSource: "toolbar-back"
-            }
-            ToolButton {
-                flat: true
-                iconSource: "toolbar-menu"
-            }
-        }
-    }
\ No newline at end of file
diff --git a/src/plugins/qmldesigner/symbianplugin/symbian.metainfo b/src/plugins/qmldesigner/symbianplugin/symbian.metainfo
deleted file mode 100644
index a9781d7387..0000000000
--- a/src/plugins/qmldesigner/symbianplugin/symbian.metainfo
+++ /dev/null
@@ -1,108 +0,0 @@
-<metainfo>
-  <node name="com.nokia.symbian.Button" icon=":/symbianplugin/images/button16.png">
-    <itemlibraryentry name="Button"  category="Components Symbian" libraryIcon=":/symbianplugin/images/button.png"  version="1.0" requiredImport="com.nokia.symbian">
-      <property name="text" type="QString" value="Button"/>
-    </itemlibraryentry>
-  </node>
-  <node name="com.nokia.symbian.ToolButton" icon=":/symbianplugin/images/button16.png">
-    <itemlibraryentry name="ToolButton"  category="Components Symbian" libraryIcon=":/symbianplugin/images/button.png"  version="1.0" requiredImport="com.nokia.symbian">
-      <property name="text" type="QString" value="Button"/>
-    </itemlibraryentry>
-  </node>
-  <node name="com.nokia.symbian.TabButton" icon=":/symbianplugin/images/tabbutton16.png">
-    <itemlibraryentry name="TabButton"  category="Components Symbian" libraryIcon=":/symbianplugin/images/tabbutton.png"  version="1.0" requiredImport="com.nokia.symbian">
-      <property name="text" type="QString" value="Button"/>
-    </itemlibraryentry>
-  </node>
-  <node name="com.nokia.symbian.CheckBox" icon=":/symbianplugin/images/checkbox16.png">
-    <itemlibraryentry name="CheckBox" category="Components Symbian" libraryIcon=":/symbianplugin/images/checkbox.png"  version="1.0" requiredImport="com.nokia.symbian">
-      <property name="text" type="QString" value="CheckBox"/>
-    </itemlibraryentry>
-  </node>
-  <node name="com.nokia.symbian.BusyIndicator" icon=":/symbianplugin/images/busyindicator16.png">
-    <itemlibraryentry name="BusyIndicator" category="Components Symbian" libraryIcon=":/symbianplugin/images/busyindicator.png"  version="1.0" requiredImport="com.nokia.symbian">
-    </itemlibraryentry>
-  </node>
-  <node name="com.nokia.symbian.SelectionListItem" icon=":/symbianplugin/images/choicelist16.png">
-    <itemlibraryentry name="SelectionListItem" category="Components Symbian" libraryIcon=":/symbianplugin/images/choicelist.png"  version="1.0" requiredImport="com.nokia.symbian">
-      <property name="title" type="QString" value="SelectionListItem"/>
-    </itemlibraryentry>
-  </node>
-  <node name="com.nokia.symbian.StatusBar" icon=":/symbianplugin/images/statusbar16.png">
-    <itemlibraryentry name="StatusBar" category="Components Symbian" libraryIcon=":/symbianplugin/images/statusbar.png"  version="1.0" requiredImport="com.nokia.symbian">
-    </itemlibraryentry>
-  </node>
-  <node name="com.nokia.symbian.ListView" icon=":/symbianplugin/images/listview-icon16.png">
-    <itemlibraryentry name="ListView" category="Components Symbian" libraryIcon=":/symbianplugin/images/listview-icon.png"  version="1.0" requiredImport="com.nokia.symbian">
-    <qml source=":/symbianplugin/source/SymbianListView.qml"/>
-    </itemlibraryentry>
-  </node>
-  <node name="com.nokia.symbian.ProgressBar" icon=":/symbianplugin/images/progressbar16.png">
-    <itemlibraryentry name="ProgressBar"  category="Components Symbian" libraryIcon=":/symbianplugin/images/progressbar.png"  version="1.0" requiredImport="com.nokia.symbian">
-    </itemlibraryentry>
-  </node>
-  <node name="com.nokia.symbian.RadioButton" icon=":/symbianplugin/images/radiobutton16.png">
-    <itemlibraryentry name="RadioButton" category="Components Symbian" libraryIcon=":/symbianplugin/images/radiobutton.png"  version="1.0" requiredImport="com.nokia.symbian">
-      <property name="text" type="QString" value="RadioButton"/>
-    </itemlibraryentry>
-  </node>
-  <node name="com.nokia.symbian.TextArea" icon=":/symbianplugin/images/textarea16.png">
-    <itemlibraryentry name="TextArea" category="Components Symbian" libraryIcon=":/symbianplugin/images/textarea.png"  version="1.0" requiredImport="com.nokia.symbian">
-      <property name="width" type="int" value="180"/>
-      <property name="height" type="int" value="180"/>
-      <property name="text" type="QString" value="TextArea"/>
-    </itemlibraryentry>
-  </node>
-  <node name="com.nokia.symbian.ButtonRow" icon=":/symbianplugin/images/buttonrow16.png">
-    <itemlibraryentry name="ButtonRow" category="Components Symbian" libraryIcon=":/symbianplugin/images/buttonrow.png"  version="1.0" requiredImport="com.nokia.symbian">
-      <property name="width" type="int" value="120"/>
-      <property name="height" type="int" value="20"/>
-    </itemlibraryentry>
-  </node>
-  <node name="com.nokia.symbian.ButtonColumn" icon=":/symbianplugin/images/buttoncolumn16.png">
-    <itemlibraryentry name="ButtonColumn" category="Components Symbian" libraryIcon=":/symbianplugin/images/buttoncolumn.png"  version="1.0" requiredImport="com.nokia.symbian">
-      <property name="width" type="int" value="20"/>
-      <property name="height" type="int" value="120"/>
-    </itemlibraryentry>
-  </node>
-  <node name="com.nokia.symbian.TabBar" icon=":/symbianplugin/images/tabbar16.png">
-    <itemlibraryentry name="TabBar" category="Components Symbian" libraryIcon=":/symbianplugin/images/tabbar.png"  version="1.0" requiredImport="com.nokia.symbian">
-    </itemlibraryentry>
-  </node>
-      <node name="com.nokia.symbian.Slider" icon=":/symbianplugin/images/slider16.png">
-    <itemlibraryentry name="Slider (horizontal)" category="Components Symbian" libraryIcon=":/symbianplugin/images/slider.png"  version="1.0" requiredImport="com.nokia.symbian">
-      <property name="orientation" type="int" value="1"/>
-    </itemlibraryentry>
-    <itemlibraryentry name="Slider (vertical)" category="Components Symbian" libraryIcon=":/symbianplugin/images/sliderh.png" version="1.0" requiredImport="com.nokia.symbian">
-      <property name="orientation" type="int" value="2"/>
-    </itemlibraryentry>
-  </node>
-  <node name="com.nokia.symbian.Page" icon=":/symbianplugin/images/window16.png">
-    <itemlibraryentry name="Page" category="Components Symbian" libraryIcon=":/symbianplugin/images/window.png"  version="1.0" requiredImport="com.nokia.symbian">
-      <property name="width" type="int" value="360"/>
-      <property name="height" type="int" value="640"/>
-    </itemlibraryentry>
-  </node>
-  <node name="com.nokia.symbian.TabGroup" icon=":/symbianplugin//images/window16.png">
-    <itemlibraryentry name="TabGroup" category="Components Symbian" libraryIcon=":/symbianplugin/images/window.png" version="1.0" requiredImport="com.nokia.symbian">
-      <property name="width" type="int" value="360"/>
-      <property name="height" type="int" value="40"/>
-    </itemlibraryentry>
-  </node>
-  <node name="com.nokia.symbian.ToolBar" icon=":/symbianplugin/images/toolbar16.png">
-    <itemlibraryentry name="ToolBar" category="Components Symbian" libraryIcon=":/symbianplugin/images/toolbar.png" version="1.0" requiredImport="com.nokia.symbian">
-    <qml source=":/symbianplugin/source/ToolBar.qml"/>
-    </itemlibraryentry>
-  </node>
-  <node name="com.nokia.symbian.Switch" icon=":/symbianplugin/images/switchbutton16.png">
-    <itemlibraryentry name="Switch" category="Components Symbian" libraryIcon=":/symbianplugin/images/switchbutton.png" version="1.0" requiredImport="com.nokia.symbian">
-    </itemlibraryentry>
-  </node>
-  <node name="com.nokia.symbian.TextField" icon=":/symbianplugin/images/textfield16.png">
-    <itemlibraryentry name="TextField" category="Components Symbian" libraryIcon=":/symbianplugin/images/textfield.png"  version="1.0" requiredImport="com.nokia.symbian">
-      <property name="width" type="int" value="180"/>
-      <property name="height" type="int" value="50"/>
-      <property name="text" type="QString" value="TextField"/>
-    </itemlibraryentry>
-  </node>
-</metainfo>
diff --git a/src/plugins/qmldesigner/symbianplugin/symbianplugin.cpp b/src/plugins/qmldesigner/symbianplugin/symbianplugin.cpp
deleted file mode 100644
index c1483eb44c..0000000000
--- a/src/plugins/qmldesigner/symbianplugin/symbianplugin.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: http://www.qt-project.org/
-**
-**
-** 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.
-**
-** 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.
-**
-**
-**************************************************************************/
-
-#include "symbianplugin.h"
-#include <widgetplugin_helper.h>
-#include <QtPlugin>
-
-namespace QmlDesigner {
-
-
-SymbianPlugin::SymbianPlugin()
-{
-}
-
-QString SymbianPlugin::pluginName() const
-{
-    return ("SymbianPlugin");
-}
-
-QString SymbianPlugin::metaInfo() const
-{
-    return QString(":/symbianplugin/symbian.metainfo");
-}
-
-}
-
-Q_EXPORT_PLUGIN(QmlDesigner::SymbianPlugin)
-
diff --git a/src/plugins/qmldesigner/symbianplugin/symbianplugin.h b/src/plugins/qmldesigner/symbianplugin/symbianplugin.h
deleted file mode 100644
index a2b3817ca4..0000000000
--- a/src/plugins/qmldesigner/symbianplugin/symbianplugin.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: http://www.qt-project.org/
-**
-**
-** 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.
-**
-** 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.
-**
-**
-**************************************************************************/
-
-#ifndef SymbianPLUGIN_H
-#define SymbianPLUGIN_H
-
-#include <iwidgetplugin.h>
-#include <qdeclarative.h>
-
-namespace QmlDesigner {
-
-class SymbianPlugin : public QObject, QmlDesigner::IWidgetPlugin
-{
-    Q_OBJECT
-    Q_INTERFACES(QmlDesigner::IWidgetPlugin)
-
-public:
-    SymbianPlugin();
-
-    QString metaInfo() const;
-    QString pluginName() const;
-};
-
-} // namespace QmlDesigner
-
-#endif // SymbianPLUGIN_H
diff --git a/src/plugins/qmldesigner/symbianplugin/symbianplugin.pri b/src/plugins/qmldesigner/symbianplugin/symbianplugin.pri
deleted file mode 100644
index 28d6323c68..0000000000
--- a/src/plugins/qmldesigner/symbianplugin/symbianplugin.pri
+++ /dev/null
@@ -1,17 +0,0 @@
-TARGET = symbianplugin
-TEMPLATE = lib
-CONFIG += plugin
-
-QT += script \
-      declarative
-
-include (../designercore/iwidgetplugin.pri)
-
-DEFINES += SYMBIAN_LIBRARY
-SOURCES += $$PWD/symbianplugin.cpp
-
-HEADERS += $$PWD/symbianplugin.h  $$PWD/../designercore/include/iwidgetplugin.h
-
-RESOURCES += $$PWD/symbianplugin.qrc
-
-OTHER_FILES += $$PWD/symbian.metainfo
diff --git a/src/plugins/qmldesigner/symbianplugin/symbianplugin.pro b/src/plugins/qmldesigner/symbianplugin/symbianplugin.pro
deleted file mode 100644
index b8ea7d042a..0000000000
--- a/src/plugins/qmldesigner/symbianplugin/symbianplugin.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-include(../../../../qtcreator.pri)
-include(../../../private_headers.pri)
-include(symbianplugin.pri)
-include(../plugindestdir.pri)
diff --git a/src/plugins/qmldesigner/symbianplugin/symbianplugin.qrc b/src/plugins/qmldesigner/symbianplugin/symbianplugin.qrc
deleted file mode 100644
index 92c2cc2062..0000000000
--- a/src/plugins/qmldesigner/symbianplugin/symbianplugin.qrc
+++ /dev/null
@@ -1,47 +0,0 @@
-<RCC>
-    <qresource prefix="/symbianplugin">
-        <file>symbian.metainfo</file>
-        <file>images/item-icon16.png</file>
-        <file>images/item-icon.png</file>
-        <file>images/button.png</file>
-        <file>images/button16.png</file>
-        <file>images/checkbox16.png</file>
-        <file>images/checkbox.png</file>
-        <file>images/choicelist16.png</file>
-        <file>images/choicelist.png</file>
-        <file>images/progressbar.png</file>
-        <file>images/progressbar16.png</file>
-        <file>images/radiobutton.png</file>
-        <file>images/radiobutton16.png</file>
-        <file>images/slider.png</file>
-        <file>images/slider16.png</file>
-        <file>images/textarea16.png</file>
-        <file>images/textarea.png</file>
-        <file>images/textfield16.png</file>
-        <file>images/textfield.png</file>
-        <file>images/window16.png</file>
-        <file>images/window.png</file>
-        <file>images/tabbutton16.png</file>
-        <file>images/tabbutton.png</file>
-        <file>images/busyindicator16.png</file>
-        <file>images/busyindicator.png</file>
-        <file>images/sliderh16.png</file>
-        <file>images/sliderh.png</file>
-        <file>images/switchbutton16.png</file>
-        <file>images/switchbutton.png</file>
-        <file>images/buttonrow.png</file>
-        <file>images/buttonrow16.png</file>
-        <file>images/tabbar.png</file>
-        <file>images/tabbar16.png</file>
-        <file>images/toolbar.png</file>
-        <file>images/toolbar16.png</file>
-        <file>images/buttoncolumn.png</file>
-        <file>images/buttoncolumn16.png</file>
-        <file>source/ToolBar.qml</file>
-        <file>images/listview-icon.png</file>
-        <file>images/listview-icon16.png</file>
-        <file>source/SymbianListView.qml</file>
-        <file>images/statusbar.png</file>
-        <file>images/statusbar16.png</file>
-    </qresource>
-</RCC>