Remove remaining support for Blackberry

The platform is no longer supported or actively maintained, and is
in the way for improvements to the Unix event dispatcher and QProcess
implementations.

Change-Id: I3935488ca12e2139ea5f46068d7665a453e20526
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>

151 files changed, 19 insertions, 3915 deletions

diff --git a/src/plugins/bearer/bearer.pro b/src/plugins/bearer/bearer.pro
index a1434fc2ea..61e6f46ebc 100644
--- a/src/plugins/bearer/bearer.pro
+++ b/src/plugins/bearer/bearer.pro
@@ -7,7 +7,6 @@ TEMPLATE = subdirs
 
 #win32:SUBDIRS += nla
 win32:SUBDIRS += generic
-blackberry:SUBDIRS += blackberry
 win32:!wince:!winrt: SUBDIRS += nativewifi
 mac:contains(QT_CONFIG, corewlan):SUBDIRS += corewlan
 mac:SUBDIRS += generic
diff --git a/src/plugins/bearer/blackberry/blackberry.json b/src/plugins/bearer/blackberry/blackberry.json
deleted file mode 100644
index 233f05cf53..0000000000
--- a/src/plugins/bearer/blackberry/blackberry.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "Keys": [ "blackberry" ]
-}
diff --git a/src/plugins/bearer/blackberry/blackberry.pro b/src/plugins/bearer/blackberry/blackberry.pro
deleted file mode 100644
index c75de3aaad..0000000000
--- a/src/plugins/bearer/blackberry/blackberry.pro
+++ /dev/null
@@ -1,20 +0,0 @@
-TARGET = qbbbearer
-
-PLUGIN_TYPE = bearer
-PLUGIN_CLASS_NAME = QBBEnginePlugin
-load(qt_plugin)
-
-QT = core-private network-private
-
-# Uncomment this to enable debugging output for the plugin
-#DEFINES += QBBENGINE_DEBUG
-
-HEADERS += qbbengine.h \
-           ../qnetworksession_impl.h \
-           ../qbearerengine_impl.h
-
-SOURCES += qbbengine.cpp \
-           ../qnetworksession_impl.cpp \
-           main.cpp
-
-OTHER_FILES += blackberry.json
diff --git a/src/plugins/bearer/blackberry/main.cpp b/src/plugins/bearer/blackberry/main.cpp
deleted file mode 100644
index ddeaefa75c..0000000000
--- a/src/plugins/bearer/blackberry/main.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Research In Motion
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qbbengine.h"
-
-#include <QtNetwork/private/qbearerplugin_p.h>
-
-#ifndef QT_NO_BEARERMANAGEMENT
-
-QT_BEGIN_NAMESPACE
-
-class QBBEnginePlugin : public QBearerEnginePlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QBearerEngineFactoryInterface" FILE "blackberry.json")
-
-public:
-    QBearerEngine *create(const QString &key) const;
-};
-
-QBearerEngine *QBBEnginePlugin::create(const QString &key) const
-{
-    if (key == QLatin1String("blackberry"))
-        return new QBBEngine;
-
-    return 0;
-}
-
-QT_END_NAMESPACE
-
-#include "main.moc"
-
-#endif // QT_NO_BEARERMANAGEMENT
diff --git a/src/plugins/bearer/blackberry/qbbengine.cpp b/src/plugins/bearer/blackberry/qbbengine.cpp
deleted file mode 100644
index d90d9fa217..0000000000
--- a/src/plugins/bearer/blackberry/qbbengine.cpp
+++ /dev/null
@@ -1,413 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Research In Motion
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qbbengine.h"
-#include "../qnetworksession_impl.h"
-
-#include <QDebug>
-#include <QThreadStorage>
-#include <QStringList>
-#include <QTimer>
-
-#include <bps/netstatus.h>
-
-#ifndef QT_NO_BEARERMANAGEMENT
-
-#ifdef QBBENGINE_DEBUG
-#define qBearerDebug qDebug
-#else
-#define qBearerDebug QT_NO_QDEBUG_MACRO
-#endif
-
-struct NetstatusInterfaceListCleanupHelper
-{
-    static inline void cleanup(netstatus_interface_list_t *list)
-    {
-        netstatus_free_interfaces(list);
-    }
-};
-
-struct NetstatusInterfaceCleanupHelper
-{
-    static inline void cleanup(char *interface)
-    {
-        bps_free(interface);
-    }
-};
-
-struct EngineInstanceHolder
-{
-    EngineInstanceHolder(QBBEngine *engine) :
-        instance(engine) {}
-
-    QBBEngine *instance;
-};
-
-Q_GLOBAL_STATIC(QThreadStorage<EngineInstanceHolder *>, instanceStorage);
-
-static QNetworkConfiguration::BearerType
-interfaceType(netstatus_interface_type_t type)
-{
-    switch (type) {
-    case NETSTATUS_INTERFACE_TYPE_USB:
-    case NETSTATUS_INTERFACE_TYPE_WIRED:
-        return QNetworkConfiguration::BearerEthernet;
-
-    case NETSTATUS_INTERFACE_TYPE_WIFI:
-        return QNetworkConfiguration::BearerWLAN;
-
-    case NETSTATUS_INTERFACE_TYPE_BLUETOOTH_DUN:
-        return QNetworkConfiguration::BearerBluetooth;
-
-    case NETSTATUS_INTERFACE_TYPE_CELLULAR:
-        // The exact bearer type is determined in QNetworkConfiguration
-        // at the time this info is queried, because opposed to the
-        // information here the type might change quickly.
-        return QNetworkConfiguration::Bearer2G;
-
-    case NETSTATUS_INTERFACE_TYPE_VPN:
-    case NETSTATUS_INTERFACE_TYPE_BB:
-    case NETSTATUS_INTERFACE_TYPE_UNKNOWN:
-        break;
-    }
-
-    return QNetworkConfiguration::BearerUnknown;
-}
-
-static QString idForName(const QString &name)
-{
-    return QStringLiteral("bps:") + name;
-}
-
-QT_BEGIN_NAMESPACE
-
-
-QBBEngine::QBBEngine(QObject *parent) :
-    QBearerEngineImpl(parent),
-    pollingRequired(false),
-    initialized(false)
-{
-}
-
-QBBEngine::~QBBEngine()
-{
-}
-
-
-QString QBBEngine::getInterfaceFromId(const QString &id)
-{
-    const QMutexLocker locker(&mutex);
-
-    return configurationInterface.value(id);
-}
-
-bool QBBEngine::hasIdentifier(const QString &id)
-{
-    const QMutexLocker locker(&mutex);
-
-    return configurationInterface.contains(id);
-}
-
-void QBBEngine::connectToId(const QString &id)
-{
-    Q_EMIT connectionError(id, OperationNotSupported);
-}
-
-void QBBEngine::disconnectFromId(const QString &id)
-{
-    Q_EMIT connectionError(id, OperationNotSupported);
-}
-
-void QBBEngine::initialize()
-{
-    if (initialized) {
-        qWarning() << Q_FUNC_INFO << "called, but instance already initialized.";
-        return;
-    }
-
-    instanceStorage()->setLocalData(new EngineInstanceHolder(this));
-
-    if (netstatus_request_events(0) != BPS_SUCCESS) {
-        qWarning() << Q_FUNC_INFO << "cannot register for network events. Polling enabled.";
-
-        const QMutexLocker locker(&pollingMutex);
-        pollingRequired = true;
-    } else {
-        QAbstractEventDispatcher::instance()->installEventFilter(this);
-    }
-
-    doRequestUpdate();
-}
-
-void QBBEngine::requestUpdate()
-{
-    doRequestUpdate();
-}
-
-void QBBEngine::doRequestUpdate()
-{
-    qBearerDebug() << Q_FUNC_INFO << "entered method";
-
-    netstatus_interface_list_t interfaceList;
-
-    if ((netstatus_get_interfaces(&interfaceList)) != BPS_SUCCESS) {
-        qBearerDebug() << Q_FUNC_INFO << "cannot retrieve interface list";
-        return;
-    }
-
-    const QScopedPointer<netstatus_interface_list_t,
-          NetstatusInterfaceListCleanupHelper> holder(&interfaceList);
-
-    QSet<QString> currentConfigurations;
-
-    for (int i = 0; i < interfaceList.num_interfaces; i++) {
-        const char *interface = interfaceList.interfaces[i];
-
-        qBearerDebug() << Q_FUNC_INFO << "discovered interface" << interface;
-
-        updateConfiguration(interface);
-
-        currentConfigurations << idForName(QString::fromLatin1(interface));
-    }
-
-    QMutexLocker locker(&mutex);
-
-    const QStringList keys = accessPointConfigurations.uniqueKeys();
-
-    locker.unlock();
-
-    Q_FOREACH (const QString &id, keys) {
-        if (!currentConfigurations.contains(id))
-            removeConfiguration(id);
-    }
-
-    Q_EMIT updateCompleted();
-}
-
-QNetworkSession::State QBBEngine::sessionStateForId(const QString &id)
-{
-    const QMutexLocker locker(&mutex);
-
-    QNetworkConfigurationPrivatePointer ptr = accessPointConfigurations.value(id);
-
-    if (!ptr || !ptr->isValid)
-        return QNetworkSession::Invalid;
-
-    if ((ptr->state & QNetworkConfiguration::Active) == QNetworkConfiguration::Active)
-        return QNetworkSession::Connected;
-    else if ((ptr->state & QNetworkConfiguration::Discovered) == QNetworkConfiguration::Discovered)
-        return QNetworkSession::Disconnected;
-    else if ((ptr->state & QNetworkConfiguration::Defined) == QNetworkConfiguration::Defined)
-        return QNetworkSession::NotAvailable;
-    else if ((ptr->state & QNetworkConfiguration::Undefined) == QNetworkConfiguration::Undefined)
-        return QNetworkSession::NotAvailable;
-
-    return QNetworkSession::Invalid;
-}
-
-QNetworkConfigurationManager::Capabilities QBBEngine::capabilities() const
-{
-    return QNetworkConfigurationManager::ForcedRoaming;
-}
-
-QNetworkSessionPrivate *QBBEngine::createSessionBackend()
-{
-    return new QNetworkSessionPrivateImpl;
-}
-
-QNetworkConfigurationPrivatePointer QBBEngine::defaultConfiguration()
-{
-    char *interface = 0;
-
-    if (netstatus_get_default_interface(&interface) != BPS_SUCCESS)
-        return QNetworkConfigurationPrivatePointer();
-
-    if (!interface)
-        return QNetworkConfigurationPrivatePointer();
-
-    const QScopedPointer<char, NetstatusInterfaceCleanupHelper> holder(interface);
-
-    const QString id = idForName(QString::fromLatin1(interface));
-
-    const QMutexLocker locker(&mutex);
-
-    if (accessPointConfigurations.contains(id)) {
-        qBearerDebug() << Q_FUNC_INFO << "found default interface:" << id;
-
-        return accessPointConfigurations.value(id);
-    }
-
-    return QNetworkConfigurationPrivatePointer();
-}
-
-bool QBBEngine::requiresPolling() const
-{
-    const QMutexLocker locker(&pollingMutex);
-
-    return pollingRequired;
-}
-
-bool QBBEngine::nativeEventFilter(const QByteArray &eventType, void *message, long *result)
-{
-    Q_UNUSED(eventType);
-    Q_UNUSED(result);
-
-    bps_event_t * const event = static_cast<bps_event_t *>(message);
-
-    Q_ASSERT(event);
-
-    if (bps_event_get_domain(event) == netstatus_get_domain()) {
-        qBearerDebug() << Q_FUNC_INFO << "got update request.";
-        doRequestUpdate();
-    }
-
-    return false;
-}
-
-void QBBEngine::updateConfiguration(const char *interface)
-{
-    netstatus_interface_details_t *details = 0;
-
-    if (netstatus_get_interface_details(interface, &details) != BPS_SUCCESS) {
-        qBearerDebug() << Q_FUNC_INFO << "cannot retrieve details for interface" << interface;
-
-        return;
-    }
-
-    const QString name = QString::fromLatin1(netstatus_interface_get_name(details));
-    const QString id = idForName(name);
-
-
-    const netstatus_interface_type_t type = netstatus_interface_get_type(details);
-    const netstatus_ip_status_t ipStatus = netstatus_interface_get_ip_status(details);
-
-    netstatus_free_interface_details(&details);
-
-    QNetworkConfiguration::StateFlags state = QNetworkConfiguration::Defined;
-
-    if (ipStatus == NETSTATUS_IP_STATUS_OK)
-        state |= QNetworkConfiguration::Active;
-
-    QMutexLocker locker(&mutex);
-
-    if (accessPointConfigurations.contains(id)) {
-        QNetworkConfigurationPrivatePointer ptr = accessPointConfigurations.value(id);
-
-        bool changed = false;
-
-        QMutexLocker ptrLocker(&ptr->mutex);
-
-        if (!ptr->isValid) {
-            ptr->isValid = true;
-            changed = true;
-        }
-
-        if (ptr->name != name) {
-            ptr->name = name;
-            changed = true;
-        }
-
-        if (ptr->id != id) {
-            ptr->id = id;
-            changed = true;
-        }
-
-        if (ptr->state != state) {
-            ptr->state = state;
-            changed = true;
-        }
-
-        const netstatus_ip_status_t oldIpStatus = ptr->oldIpStatus;
-        ptr->oldIpStatus = ipStatus;
-
-        ptrLocker.unlock();
-
-        locker.unlock();
-
-        if (changed) {
-            qBearerDebug() << Q_FUNC_INFO << "configuration changed:" << interface;
-
-            Q_EMIT configurationChanged(ptr);
-        } else {
-            // maybe Wifi has changed but gateway not yet ready etc.
-            qBearerDebug() << Q_FUNC_INFO << "configuration has not changed.";
-            if (oldIpStatus != ipStatus) { // if IP status changed
-                if (ipStatus != NETSTATUS_IP_STATUS_OK
-                        && ipStatus != NETSTATUS_IP_STATUS_ERROR_NOT_UP
-                        && ipStatus != NETSTATUS_IP_STATUS_ERROR_NOT_CONFIGURED) {
-                    // work around race condition in netstatus API by just checking
-                    // again in 300 ms
-                    QTimer::singleShot(300, this, SLOT(doRequestUpdate()));
-                }
-            }
-        }
-
-        return;
-    }
-
-    QNetworkConfigurationPrivatePointer ptr(new QNetworkConfigurationPrivate);
-
-    ptr->name = name;
-    ptr->isValid = true;
-    ptr->id = id;
-    ptr->state = state;
-    ptr->type = QNetworkConfiguration::InternetAccessPoint;
-    ptr->bearerType = interfaceType(type);
-
-    accessPointConfigurations.insert(id, ptr);
-    configurationInterface.insert(id, name);
-
-    locker.unlock();
-
-    qBearerDebug() << Q_FUNC_INFO << "configuration added:" << interface;
-
-    Q_EMIT configurationAdded(ptr);
-}
-
-void QBBEngine::removeConfiguration(const QString &id)
-{
-    QMutexLocker locker(&mutex);
-
-    QNetworkConfigurationPrivatePointer ptr =
-        accessPointConfigurations.take(id);
-
-    configurationInterface.remove(ptr->id);
-
-    locker.unlock();
-
-    Q_EMIT configurationRemoved(ptr);
-}
-
-QT_END_NAMESPACE
-
-#endif // QT_NO_BEARERMANAGEMENT
diff --git a/src/plugins/bearer/blackberry/qbbengine.h b/src/plugins/bearer/blackberry/qbbengine.h
deleted file mode 100644
index 08790797ea..0000000000
--- a/src/plugins/bearer/blackberry/qbbengine.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Research In Motion
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QBBENGINE_H
-#define QBBENGINE_H
-
-#include "../qbearerengine_impl.h"
-
-#include <QAbstractEventDispatcher>
-#include <QAbstractNativeEventFilter>
-
-#ifndef QT_NO_BEARERMANAGEMENT
-
-struct bps_event_t;
-
-QT_BEGIN_NAMESPACE
-
-class QNetworkConfigurationPrivate;
-class QNetworkSessionPrivate;
-
-class QBBEngine : public QBearerEngineImpl, public QAbstractNativeEventFilter
-{
-    Q_OBJECT
-
-public:
-    explicit QBBEngine(QObject *parent = 0);
-    ~QBBEngine();
-
-    QString getInterfaceFromId(const QString &id) Q_DECL_OVERRIDE;
-    bool hasIdentifier(const QString &id) Q_DECL_OVERRIDE;
-
-    void connectToId(const QString &id) Q_DECL_OVERRIDE;
-    void disconnectFromId(const QString &id) Q_DECL_OVERRIDE;
-
-    Q_INVOKABLE void initialize() Q_DECL_OVERRIDE;
-    Q_INVOKABLE void requestUpdate() Q_DECL_OVERRIDE;
-
-    QNetworkSession::State sessionStateForId(const QString &id) Q_DECL_OVERRIDE;
-
-    QNetworkConfigurationManager::Capabilities capabilities() const Q_DECL_OVERRIDE;
-
-    QNetworkSessionPrivate *createSessionBackend() Q_DECL_OVERRIDE;
-
-    QNetworkConfigurationPrivatePointer defaultConfiguration() Q_DECL_OVERRIDE;
-
-    bool requiresPolling() const Q_DECL_OVERRIDE;
-
-    bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) Q_DECL_OVERRIDE;
-
-protected:
-    void updateConfiguration(const char *interface);
-    void removeConfiguration(const QString &id);
-
-private Q_SLOTS:
-    void doRequestUpdate();
-
-private:
-    QHash<QString, QString> configurationInterface;
-
-    mutable QMutex pollingMutex;
-
-    bool pollingRequired;
-    bool initialized;
-};
-
-
-QT_END_NAMESPACE
-
-#endif // QT_NO_BEARERMANAGEMENT
-
-#endif // QBBENGINE_H
diff --git a/src/plugins/platforms/qnx/qblackberrytheme.cpp b/src/plugins/platforms/qnx/qblackberrytheme.cpp
deleted file mode 100644
index f75e8f3766..0000000000
--- a/src/plugins/platforms/qnx/qblackberrytheme.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-/***************************************************************************
-**
-** Copyright (C) 2012 Research In Motion
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qblackberrytheme.h"
-
-#include "qqnxfiledialoghelper.h"
-#include "qqnxsystemsettings.h"
-#include "qqnxintegration.h"
-
-QT_BEGIN_NAMESPACE
-
-QBlackberryTheme::QBlackberryTheme(const QQnxIntegration *integration) : m_integration(integration)
-{
-    // Set the dark theme as default palette
-    QColor color = QColor(211, 211, 211);
-    m_defaultPalette.setBrush(QPalette::ButtonText, color);
-    m_defaultPalette.setBrush(QPalette::WindowText, color);
-    m_defaultPalette.setBrush(QPalette::Text, color);
-
-    color.setAlpha(179);
-    m_defaultPalette.setBrush(QPalette::Disabled, QPalette::ButtonText, color);
-    m_defaultPalette.setBrush(QPalette::Disabled, QPalette::WindowText, color);
-    m_defaultPalette.setBrush(QPalette::Disabled, QPalette::Text, color);
-
-    color.setRgb(18, 18, 18);
-    m_defaultPalette.setColor(QPalette::Window, color);
-    m_defaultPalette.setColor(QPalette::Base, color);
-    m_defaultPalette.setColor(QPalette::AlternateBase, QColor(50, 50, 50));
-    m_defaultPalette.setColor(QPalette::Button, color);
-
-    m_defaultPalette.setBrush(QPalette::Highlight, QColor(0, 168, 223));
-    m_defaultPalette.setBrush(QPalette::HighlightedText, QColor(250, 250,250));
-}
-
-QBlackberryTheme::~QBlackberryTheme()
-{
-    qDeleteAll(m_fonts);
-}
-
-bool QBlackberryTheme::usePlatformNativeDialog(DialogType type) const
-{
-    if (type == QPlatformTheme::FileDialog)
-        return true;
-#if !defined(QT_NO_COLORDIALOG)
-    if (type == QPlatformTheme::ColorDialog)
-        return false;
-#endif
-#if !defined(QT_NO_FONTDIALOG)
-    if (type == QPlatformTheme::FontDialog)
-        return false;
-#endif
-    return false;
-}
-
-QPlatformDialogHelper *QBlackberryTheme::createPlatformDialogHelper(DialogType type) const
-{
-    switch (type) {
-    case QPlatformTheme::FileDialog:
-        return new QQnxFileDialogHelper(m_integration);
-#if !defined(QT_NO_COLORDIALOG)
-    case QPlatformTheme::ColorDialog:
-#endif
-#if !defined(QT_NO_FONTDIALOG)
-    case QPlatformTheme::FontDialog:
-#endif
-    default:
-        return 0;
-    }
-}
-
-const QFont *QBlackberryTheme::font(Font type) const
-{
-    QPlatformFontDatabase *fontDatabase = m_integration->fontDatabase();
-
-    if (fontDatabase && m_fonts.isEmpty())
-        m_fonts = qt_qnx_createRoleFonts(fontDatabase);
-    return m_fonts.value(type, 0);
-}
-
-const QPalette *QBlackberryTheme::palette(Palette type) const
-{
-    // Return the default palette
-    if (type == SystemPalette)
-        return &m_defaultPalette;
-
-    return QPlatformTheme::palette(type);
-}
-
-QT_END_NAMESPACE
diff --git a/src/plugins/platforms/qnx/qblackberrytheme.h b/src/plugins/platforms/qnx/qblackberrytheme.h
deleted file mode 100644
index bcef4e5ef4..0000000000
--- a/src/plugins/platforms/qnx/qblackberrytheme.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/***************************************************************************
-**
-** Copyright (C) 2012 Research In Motion
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QBLACKBERRYTHEME_H
-#define QBLACKBERRYTHEME_H
-
-#include <qpa/qplatformtheme.h>
-
-#include <QtGui/qfont.h>
-
-#include <QtCore/qhash.h>
-#include <QtCore/qstring.h>
-
-#include <QtGui/QPalette>
-
-QT_BEGIN_NAMESPACE
-
-class QQnxIntegration;
-
-class QBlackberryTheme : public QPlatformTheme
-{
-public:
-    explicit QBlackberryTheme(const QQnxIntegration *);
-    ~QBlackberryTheme();
-
-    static QString name() { return QStringLiteral("blackberry"); }
-
-    bool usePlatformNativeDialog(DialogType type) const;
-    QPlatformDialogHelper *createPlatformDialogHelper(DialogType type) const;
-
-    const QFont *font(Font type = SystemFont) const;
-
-    const QPalette *palette(Palette type = SystemPalette) const;
-
-private:
-    mutable QHash<QPlatformTheme::Font, QFont*> m_fonts;
-    const QQnxIntegration *m_integration;
-    QPalette m_defaultPalette;
-};
-
-QT_END_NAMESPACE
-
-#endif // QBLACKBERRYTHEME_H
diff --git a/src/plugins/platforms/qnx/qnx.pro b/src/plugins/platforms/qnx/qnx.pro
index 95a8e44cb8..5a0f4f5c98 100644
--- a/src/plugins/platforms/qnx/qnx.pro
+++ b/src/plugins/platforms/qnx/qnx.pro
@@ -5,10 +5,9 @@ QT += platformsupport-private core-private gui-private
 # Uncomment this to build with support for IMF once it becomes available in the BBNDK
 #CONFIG += qqnx_imf
 
-!blackberry:CONFIG += qqnx_screeneventthread
+CONFIG += qqnx_screeneventthread
 
 # Uncomment these to enable debugging output for various aspects of the plugin
-#DEFINES += QQNXBPSEVENTFILTER_DEBUG
 #DEFINES += QQNXBUFFER_DEBUG
 #DEFINES += QQNXBUTTON_DEBUG
 #DEFINES += QQNXCLIPBOARD_DEBUG
@@ -86,52 +85,20 @@ contains(QT_CONFIG, opengles2) {
     LIBS += -lEGL
 }
 
-CONFIG(blackberry) {
-    SOURCES += qqnxnavigatorbps.cpp \
-               qqnxeventdispatcher_blackberry.cpp \
-               qqnxbpseventfilter.cpp \
-               qqnxvirtualkeyboardbps.cpp \
-               qblackberrytheme.cpp \
-               qqnxsystemsettings.cpp
-
-    HEADERS += qqnxnavigatorbps.h \
-               qqnxeventdispatcher_blackberry.h \
-               qqnxbpseventfilter.h \
-               qqnxvirtualkeyboardbps.h  \
-               qblackberrytheme.h \
-               qqnxsystemsettings.h \
-               qqnxfiledialoghelper.h
-
-    LIBS += -lbps
-}
-
-CONFIG(blackberry) {
-    SOURCES += qqnxfiledialoghelper_bb10.cpp \
-               qqnxfilepicker.cpp \
-               qqnxnavigatorcover.cpp
-
-    HEADERS += qqnxfilepicker.h \
-               qqnxnavigatorcover.h
-}
-
 CONFIG(qqnx_pps) {
     DEFINES += QQNX_PPS
 
     SOURCES += qqnxclipboard.cpp \
-               qqnxbuttoneventnotifier.cpp
+               qqnxbuttoneventnotifier.cpp \
+               qqnxnavigatorpps.cpp \
+               qqnxnavigatoreventnotifier.cpp \
+               qqnxvirtualkeyboardpps.cpp
 
     HEADERS += qqnxclipboard.h \
-               qqnxbuttoneventnotifier.h
-
-    !blackberry {
-        SOURCES += qqnxnavigatorpps.cpp \
-                   qqnxnavigatoreventnotifier.cpp \
-                   qqnxvirtualkeyboardpps.cpp
-
-        HEADERS += qqnxnavigatorpps.h \
-                   qqnxnavigatoreventnotifier.h \
-                   qqnxvirtualkeyboardpps.h
-    }
+               qqnxbuttoneventnotifier.h \
+               qqnxnavigatorpps.h \
+               qqnxnavigatoreventnotifier.h \
+               qqnxvirtualkeyboardpps.h
 
     LIBS += -lpps
     !contains(DEFINES, QT_NO_CLIPBOARD): LIBS += -lclipboard
diff --git a/src/plugins/platforms/qnx/qqnxbpseventfilter.cpp b/src/plugins/platforms/qnx/qqnxbpseventfilter.cpp
deleted file mode 100644
index 3950681c5e..0000000000
--- a/src/plugins/platforms/qnx/qqnxbpseventfilter.cpp
+++ /dev/null
@@ -1,229 +0,0 @@
-/***************************************************************************
-**
-** Copyright (C) 2012 Research In Motion
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qqnxbpseventfilter.h"
-#include "qqnxnavigatoreventhandler.h"
-#include "qqnxscreen.h"
-#include "qqnxscreeneventhandler.h"
-#include "qqnxvirtualkeyboardbps.h"
-#include "qqnxfiledialoghelper.h"
-
-#include <QCoreApplication>
-#include <QAbstractEventDispatcher>
-#include <QDebug>
-
-#include <bps/event.h>
-#include <bps/navigator.h>
-#include <bps/screen.h>
-
-#if defined(QQNXBPSEVENTFILTER_DEBUG)
-#define qBpsEventFilterDebug qDebug
-#else
-#define qBpsEventFilterDebug QT_NO_QDEBUG_MACRO
-#endif
-
-QT_BEGIN_NAMESPACE
-
-static QQnxBpsEventFilter *s_instance = 0;
-
-QQnxBpsEventFilter::QQnxBpsEventFilter(QQnxNavigatorEventHandler *navigatorEventHandler,
-                                       QQnxScreenEventHandler *screenEventHandler,
-                                       QQnxVirtualKeyboardBps *virtualKeyboard, QObject *parent)
-    : QObject(parent)
-    , m_navigatorEventHandler(navigatorEventHandler)
-    , m_screenEventHandler(screenEventHandler)
-    , m_virtualKeyboard(virtualKeyboard)
-{
-    Q_ASSERT(s_instance == 0);
-
-    s_instance = this;
-}
-
-QQnxBpsEventFilter::~QQnxBpsEventFilter()
-{
-    Q_ASSERT(s_instance == this);
-
-    s_instance = 0;
-}
-
-void QQnxBpsEventFilter::installOnEventDispatcher(QAbstractEventDispatcher *dispatcher)
-{
-    qBpsEventFilterDebug() << Q_FUNC_INFO << "dispatcher=" << dispatcher;
-
-    if (navigator_request_events(NAVIGATOR_EXTENDED_DATA) != BPS_SUCCESS)
-        qWarning("QQNX: failed to register for navigator events");
-
-    dispatcher->installNativeEventFilter(this);
-}
-
-void QQnxBpsEventFilter::registerForScreenEvents(QQnxScreen *screen)
-{
-    if (!m_screenEventHandler) {
-        qWarning("QQNX: trying to register for screen events, but no handler provided.");
-        return;
-    }
-
-    int attached;
-    if (screen_get_display_property_iv(screen->nativeDisplay(), SCREEN_PROPERTY_ATTACHED, &attached) != BPS_SUCCESS) {
-        qWarning() << "QQNX: unable to query display attachment";
-        return;
-    }
-
-    if (!attached) {
-        qBpsEventFilterDebug() << "skipping event registration for non-attached screen";
-        return;
-    }
-
-    if (screen_request_events(screen->nativeContext()) != BPS_SUCCESS)
-        qWarning("QQNX: failed to register for screen events on screen %p", screen->nativeContext());
-}
-
-void QQnxBpsEventFilter::unregisterForScreenEvents(QQnxScreen *screen)
-{
-    if (!m_screenEventHandler) {
-        qWarning("QQNX: trying to unregister for screen events, but no handler provided.");
-        return;
-    }
-
-    if (screen_stop_events(screen->nativeContext()) != BPS_SUCCESS)
-        qWarning("QQNX: failed to unregister for screen events on screen %p", screen->nativeContext());
-}
-
-bool QQnxBpsEventFilter::nativeEventFilter(const QByteArray &eventType, void *message, long *result)
-{
-    Q_UNUSED(eventType);
-    Q_UNUSED(result);
-    bps_event_t *event = static_cast<bps_event_t *>(message);
-    const int eventDomain = bps_event_get_domain(event);
-    qBpsEventFilterDebug() << Q_FUNC_INFO << "event=" << event << "domain=" << eventDomain;
-
-    if (eventDomain == screen_get_domain()) {
-        if (!m_screenEventHandler) {
-            qWarning("QQNX: registered for screen events, but no handler provided.");
-            return false;
-        }
-
-        screen_event_t screenEvent = screen_event_get_event(event);
-        return m_screenEventHandler->handleEvent(screenEvent);
-    }
-
-    if (eventDomain == navigator_get_domain())
-        return handleNavigatorEvent(event);
-
-    if (m_virtualKeyboard->handleEvent(event))
-        return true;
-
-    return false;
-}
-
-bool QQnxBpsEventFilter::handleNavigatorEvent(bps_event_t *event)
-{
-    switch (bps_event_get_code(event)) {
-    case NAVIGATOR_ORIENTATION_CHECK: {
-        const int angle = navigator_event_get_orientation_angle(event);
-        qBpsEventFilterDebug() << Q_FUNC_INFO << "ORIENTATION CHECK event. angle=" << angle;
-
-        const bool result = m_navigatorEventHandler->handleOrientationCheck(angle);
-        qBpsEventFilterDebug() << Q_FUNC_INFO << "ORIENTATION CHECK event. result=" << result;
-
-        // reply to navigator whether orientation is acceptable
-        navigator_orientation_check_response(event, result);
-        break;
-    }
-
-    case NAVIGATOR_ORIENTATION: {
-        const int angle = navigator_event_get_orientation_angle(event);
-        qBpsEventFilterDebug() << Q_FUNC_INFO << "ORIENTATION event. angle=" << angle;
-        m_navigatorEventHandler->handleOrientationChange(angle);
-
-        navigator_done_orientation(event);
-        break;
-    }
-
-    case NAVIGATOR_SWIPE_DOWN:
-        qBpsEventFilterDebug() << Q_FUNC_INFO << "SWIPE DOWN event";
-        m_navigatorEventHandler->handleSwipeDown();
-        break;
-
-    case NAVIGATOR_EXIT:
-        qBpsEventFilterDebug() << Q_FUNC_INFO << "EXIT event";
-        m_navigatorEventHandler->handleExit();
-        break;
-
-    case NAVIGATOR_WINDOW_STATE: {
-        qBpsEventFilterDebug() << Q_FUNC_INFO << "WINDOW STATE event";
-        const navigator_window_state_t state = navigator_event_get_window_state(event);
-        const QByteArray id(navigator_event_get_groupid(event));
-
-        switch (state) {
-        case NAVIGATOR_WINDOW_FULLSCREEN:
-            m_navigatorEventHandler->handleWindowGroupStateChanged(id, Qt::WindowFullScreen);
-            break;
-        case NAVIGATOR_WINDOW_THUMBNAIL:
-            m_navigatorEventHandler->handleWindowGroupStateChanged(id, Qt::WindowMinimized);
-            break;
-        case NAVIGATOR_WINDOW_INVISIBLE:
-            break;
-        }
-
-        break;
-    }
-
-    case NAVIGATOR_WINDOW_ACTIVE: {
-        qBpsEventFilterDebug() << Q_FUNC_INFO << "WINDOW ACTIVE event";
-        const QByteArray id(navigator_event_get_groupid(event));
-        m_navigatorEventHandler->handleWindowGroupActivated(id);
-        break;
-    }
-
-    case NAVIGATOR_WINDOW_INACTIVE: {
-        qBpsEventFilterDebug() << Q_FUNC_INFO << "WINDOW INACTIVE event";
-        const QByteArray id(navigator_event_get_groupid(event));
-        m_navigatorEventHandler->handleWindowGroupDeactivated(id);
-        break;
-    }
-
-    case NAVIGATOR_LOW_MEMORY:
-        qWarning() << "QGuiApplication based process" << QCoreApplication::applicationPid()
-                   << "received \"NAVIGATOR_LOW_MEMORY\" event";
-        return false;
-
-    default:
-        qBpsEventFilterDebug() << Q_FUNC_INFO << "Unhandled navigator event. code=" << bps_event_get_code(event);
-        return false;
-    }
-
-    return true;
-}
-
-QT_END_NAMESPACE
diff --git a/src/plugins/platforms/qnx/qqnxbpseventfilter.h b/src/plugins/platforms/qnx/qqnxbpseventfilter.h
deleted file mode 100644
index f1d67848e8..0000000000
--- a/src/plugins/platforms/qnx/qqnxbpseventfilter.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/***************************************************************************
-**
-** Copyright (C) 2012 Research In Motion
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QQNXBPSEVENTFILTER_H
-#define QQNXBPSEVENTFILTER_H
-
-#include <QObject>
-#include <QHash>
-#include <QAbstractNativeEventFilter>
-
-#include <bps/dialog.h>
-
-struct bps_event_t;
-
-QT_BEGIN_NAMESPACE
-
-class QAbstractEventDispatcher;
-class QQnxNavigatorEventHandler;
-class QQnxFileDialogHelper;
-class QQnxScreen;
-class QQnxScreenEventHandler;
-class QQnxVirtualKeyboardBps;
-
-class QQnxBpsEventFilter : public QObject, public QAbstractNativeEventFilter
-{
-    Q_OBJECT
-public:
-    QQnxBpsEventFilter(QQnxNavigatorEventHandler *navigatorEventHandler,
-                       QQnxScreenEventHandler *screenEventHandler,
-                       QQnxVirtualKeyboardBps *virtualKeyboard, QObject *parent = 0);
-    ~QQnxBpsEventFilter();
-
-    void installOnEventDispatcher(QAbstractEventDispatcher *dispatcher);
-
-    void registerForScreenEvents(QQnxScreen *screen);
-    void unregisterForScreenEvents(QQnxScreen *screen);
-
-private:
-    bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) Q_DECL_OVERRIDE;
-
-    bool handleNavigatorEvent(bps_event_t *event);
-
-private:
-    QQnxNavigatorEventHandler *m_navigatorEventHandler;
-    QQnxScreenEventHandler *m_screenEventHandler;
-    QQnxVirtualKeyboardBps *m_virtualKeyboard;
-    QHash<dialog_instance_t, QQnxFileDialogHelper*> m_dialogMapper;
-};
-
-QT_END_NAMESPACE
-
-#endif // QQNXBPSEVENTFILTER_H
diff --git a/src/plugins/platforms/qnx/qqnxbuttoneventnotifier.cpp b/src/plugins/platforms/qnx/qqnxbuttoneventnotifier.cpp
index ae3153336f..635f56e8b6 100644
--- a/src/plugins/platforms/qnx/qqnxbuttoneventnotifier.cpp
+++ b/src/plugins/platforms/qnx/qqnxbuttoneventnotifier.cpp
@@ -82,7 +82,7 @@ void QQnxButtonEventNotifier::start()
     errno = 0;
     m_fd = qt_safe_open(ppsPath, O_RDONLY);
     if (m_fd == -1) {
-#if defined(Q_OS_BLACKBERRY) || defined (QQNXBUTTON_DEBUG)
+#if defined (QQNXBUTTON_DEBUG)
         qWarning("QQNX: failed to open buttons pps, errno=%d", errno);
 #endif
         return;
diff --git a/src/plugins/platforms/qnx/qqnxeventdispatcher_blackberry.cpp b/src/plugins/platforms/qnx/qqnxeventdispatcher_blackberry.cpp
deleted file mode 100644
index 30596fe08f..0000000000
--- a/src/plugins/platforms/qnx/qqnxeventdispatcher_blackberry.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/***************************************************************************
-**
-** Copyright (C) 2012 Research In Motion
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qqnxeventdispatcher_blackberry.h"
-
-#include <qpa/qwindowsysteminterface.h>
-#include <private/qguiapplication_p.h>
-
-QT_BEGIN_NAMESPACE
-
-
-QQnxEventDispatcherBlackberry::QQnxEventDispatcherBlackberry(QObject *parent)
-    : QEventDispatcherBlackberry(parent)
-{
-}
-
-QQnxEventDispatcherBlackberry::~QQnxEventDispatcherBlackberry()
-{
-}
-
-bool QQnxEventDispatcherBlackberry::processEvents(QEventLoop::ProcessEventsFlags flags)
-{
-    const bool didSendEvents = QEventDispatcherBlackberry::processEvents(flags);
-    return QWindowSystemInterface::sendWindowSystemEvents(flags) || didSendEvents;
-}
-
-bool QQnxEventDispatcherBlackberry::hasPendingEvents()
-{
-    return QEventDispatcherBlackberry::hasPendingEvents() || QWindowSystemInterface::windowSystemEventsQueued();
-}
-
-void QQnxEventDispatcherBlackberry::flush()
-{
-    if (qApp)
-        qApp->sendPostedEvents();
-}
-
-QT_END_NAMESPACE
diff --git a/src/plugins/platforms/qnx/qqnxeventdispatcher_blackberry.h b/src/plugins/platforms/qnx/qqnxeventdispatcher_blackberry.h
deleted file mode 100644
index 036bf126ab..0000000000
--- a/src/plugins/platforms/qnx/qqnxeventdispatcher_blackberry.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/***************************************************************************
-**
-** Copyright (C) 2012 Research In Motion
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QQNXEVENTDISPATCHER_BLACKBERRY_H
-#define QQNXEVENTDISPATCHER_BLACKBERRY_H
-
-#include <qglobal.h>
-#include <private/qeventdispatcher_blackberry_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class QQnxEventDispatcherBlackberry : public QEventDispatcherBlackberry
-{
-    Q_OBJECT
-
-public:
-    explicit QQnxEventDispatcherBlackberry(QObject *parent = 0);
-    ~QQnxEventDispatcherBlackberry();
-
-    bool processEvents(QEventLoop::ProcessEventsFlags flags);
-    bool hasPendingEvents();
-
-    void flush();
-};
-
-QT_END_NAMESPACE
-
-#endif // QQNXEVENTDISPATCHER_BLACKBERRY_H
diff --git a/src/plugins/platforms/qnx/qqnxfiledialoghelper.h b/src/plugins/platforms/qnx/qqnxfiledialoghelper.h
deleted file mode 100644
index 76cceafcfe..0000000000
--- a/src/plugins/platforms/qnx/qqnxfiledialoghelper.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/***************************************************************************
-**
-** Copyright (C) 2012 Research In Motion
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QQNXFILEDIALOGHELPER_H
-#define QQNXFILEDIALOGHELPER_H
-
-#include <qpa/qplatformdialoghelper.h>
-
-
-QT_BEGIN_NAMESPACE
-
-class QQnxIntegration;
-
-class QQnxFilePicker;
-
-class QQnxFileDialogHelper : public QPlatformFileDialogHelper
-{
-    Q_OBJECT
-public:
-    explicit QQnxFileDialogHelper(const QQnxIntegration *);
-    ~QQnxFileDialogHelper();
-
-    void exec();
-
-    bool show(Qt::WindowFlags flags, Qt::WindowModality modality, QWindow *parent);
-    void hide();
-
-    bool defaultNameFilterDisables() const;
-    void setDirectory(const QUrl &directory) Q_DECL_OVERRIDE;
-    QUrl directory() const Q_DECL_OVERRIDE;
-    void selectFile(const QUrl &fileName) Q_DECL_OVERRIDE;
-    QList<QUrl> selectedFiles() const Q_DECL_OVERRIDE;
-    void setFilter();
-    void selectNameFilter(const QString &filter);
-    QString selectedNameFilter() const;
-
-    QQnxFilePicker *nativeDialog() const { return m_dialog; }
-
-Q_SIGNALS:
-    void dialogClosed();
-
-private Q_SLOTS:
-    void emitSignals();
-
-private:
-    void setNameFilter(const QString &filter);
-    void setNameFilters(const QStringList &filters);
-
-    const QQnxIntegration *m_integration;
-    QQnxFilePicker *m_dialog;
-    QFileDialogOptions::AcceptMode m_acceptMode;
-    QString m_selectedFilter;
-};
-
-QT_END_NAMESPACE
-
-#endif // QQNXFILEDIALOGHELPER_H
diff --git a/src/plugins/platforms/qnx/qqnxfiledialoghelper_bb10.cpp b/src/plugins/platforms/qnx/qqnxfiledialoghelper_bb10.cpp
deleted file mode 100644
index bad29d5f1d..0000000000
--- a/src/plugins/platforms/qnx/qqnxfiledialoghelper_bb10.cpp
+++ /dev/null
@@ -1,212 +0,0 @@
-/***************************************************************************
-**
-** Copyright (C) 2013 Research In Motion
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qqnxfiledialoghelper.h"
-
-#include "qqnxfilepicker.h"
-#include "qqnxbpseventfilter.h"
-#include "qqnxscreen.h"
-#include "qqnxintegration.h"
-
-#include <QDebug>
-#include <QEventLoop>
-#include <QScreen>
-#include <QTimer>
-#include <QWindow>
-
-#ifdef QQNXFILEDIALOGHELPER_DEBUG
-#define qFileDialogHelperDebug qDebug
-#else
-#define qFileDialogHelperDebug QT_NO_QDEBUG_MACRO
-#endif
-
-QT_BEGIN_NAMESPACE
-
-QQnxFileDialogHelper::QQnxFileDialogHelper(const QQnxIntegration *integration)
-    : QPlatformFileDialogHelper(),
-      m_integration(integration),
-      m_dialog(new QQnxFilePicker),
-      m_acceptMode(QFileDialogOptions::AcceptOpen),
-      m_selectedFilter()
-{
-    connect(m_dialog, &QQnxFilePicker::closed, this, &QQnxFileDialogHelper::emitSignals);
-}
-
-QQnxFileDialogHelper::~QQnxFileDialogHelper()
-{
-    delete m_dialog;
-}
-
-void QQnxFileDialogHelper::exec()
-{
-    qFileDialogHelperDebug() << Q_FUNC_INFO;
-
-    // Clear any previous results
-    m_dialog->setDirectories(QStringList());
-
-    QEventLoop loop;
-    connect(m_dialog, SIGNAL(closed()), &loop, SLOT(quit()));
-    loop.exec();
-}
-
-bool QQnxFileDialogHelper::show(Qt::WindowFlags flags, Qt::WindowModality modality, QWindow *parent)
-{
-    Q_UNUSED(flags);
-    Q_UNUSED(parent);
-    Q_UNUSED(modality);
-
-    qFileDialogHelperDebug() << Q_FUNC_INFO;
-
-    // Create dialog
-    const QSharedPointer<QFileDialogOptions> &opts = options();
-    if (opts->acceptMode() == QFileDialogOptions::AcceptOpen) {
-        // Select one or many files?
-        const QQnxFilePicker::Mode mode = (opts->fileMode() == QFileDialogOptions::ExistingFiles)
-            ? QQnxFilePicker::PickerMultiple : QQnxFilePicker::Picker;
-
-        m_dialog->setMode(mode);
-
-        // Set the actual list of extensions
-        if (!opts->nameFilters().isEmpty())
-            setNameFilters(opts->nameFilters());
-        else
-            setNameFilter(tr("All files (*.*)"));
-    } else {
-        const QQnxFilePicker::Mode mode = (opts->initiallySelectedFiles().count() >= 2)
-            ? QQnxFilePicker::SaverMultiple : QQnxFilePicker::Saver;
-
-        m_dialog->setMode(mode);
-
-        if (!opts->initiallySelectedFiles().isEmpty()) {
-            QStringList files;
-            Q_FOREACH ( const QUrl &url, opts->initiallySelectedFiles() )
-                files.append(url.toLocalFile());
-            m_dialog->setDefaultSaveFileNames(files);
-        }
-    }
-
-    // Cache the accept mode so we know which functions to use to get the results back
-    m_acceptMode = opts->acceptMode();
-    m_dialog->setTitle(opts->windowTitle());
-    m_dialog->open();
-
-    return true;
-}
-
-void QQnxFileDialogHelper::hide()
-{
-    qFileDialogHelperDebug() << Q_FUNC_INFO;
-    m_dialog->close();
-}
-
-bool QQnxFileDialogHelper::defaultNameFilterDisables() const
-{
-    qFileDialogHelperDebug() << Q_FUNC_INFO;
-    return false;
-}
-
-void QQnxFileDialogHelper::setDirectory(const QUrl &directory)
-{
-    m_dialog->addDirectory(directory.toLocalFile());
-}
-
-QUrl QQnxFileDialogHelper::directory() const
-{
-    qFileDialogHelperDebug() << Q_FUNC_INFO;
-    if (!m_dialog->directories().isEmpty())
-        return QUrl::fromLocalFile(m_dialog->directories().first());
-
-    return QUrl();
-}
-
-void QQnxFileDialogHelper::selectFile(const QUrl &fileName)
-{
-    m_dialog->addDefaultSaveFileName(fileName.toLocalFile());
-}
-
-QList<QUrl> QQnxFileDialogHelper::selectedFiles() const
-{
-    qFileDialogHelperDebug() << Q_FUNC_INFO;
-    QList<QUrl> urls;
-    QStringList files = m_dialog->selectedFiles();
-    Q_FOREACH (const QString &file, files)
-        urls.append(QUrl::fromLocalFile(file));
-    return urls;
-}
-
-void QQnxFileDialogHelper::setFilter()
-{
-    // No native api to support setting a filter from QDir::Filters
-    qFileDialogHelperDebug() << Q_FUNC_INFO;
-}
-
-void QQnxFileDialogHelper::selectNameFilter(const QString &filter)
-{
-    qFileDialogHelperDebug() << Q_FUNC_INFO << "filter =" << filter;
-    setNameFilter(filter);
-}
-
-QString QQnxFileDialogHelper::selectedNameFilter() const
-{
-    // For now there is no way for the user to change the selected filter
-    // so this just reflects what the developer has set programmatically.
-    qFileDialogHelperDebug() << Q_FUNC_INFO;
-    return m_selectedFilter;
-}
-
-void QQnxFileDialogHelper::emitSignals()
-{
-    if (m_dialog->selectedFiles().isEmpty())
-        Q_EMIT reject();
-    else
-        Q_EMIT accept();
-}
-
-void QQnxFileDialogHelper::setNameFilter(const QString &filter)
-{
-    qFileDialogHelperDebug() << Q_FUNC_INFO << "filter =" << filter;
-
-    setNameFilters(QPlatformFileDialogHelper::cleanFilterList(filter));
-}
-
-void QQnxFileDialogHelper::setNameFilters(const QStringList &filters)
-{
-    qFileDialogHelperDebug() << Q_FUNC_INFO << "filters =" << filters;
-
-    Q_ASSERT(!filters.isEmpty());
-
-    m_dialog->setFilters(filters);
-    m_selectedFilter = filters.first();
-}
-
-QT_END_NAMESPACE
diff --git a/src/plugins/platforms/qnx/qqnxfilepicker.cpp b/src/plugins/platforms/qnx/qqnxfilepicker.cpp
deleted file mode 100644
index ca8d731e66..0000000000
--- a/src/plugins/platforms/qnx/qqnxfilepicker.cpp
+++ /dev/null
@@ -1,322 +0,0 @@
-/***************************************************************************
-**
-** Copyright (C) 2013 Research In Motion
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qqnxfilepicker.h"
-
-#include <QAbstractEventDispatcher>
-#include <QCoreApplication>
-#include <QDebug>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonArray>
-#include <QJsonParseError>
-#include <QMimeDatabase>
-#include <QUrl>
-#include <private/qppsobject_p.h>
-
-#include <bps/navigator.h>
-#include <bps/navigator_invoke.h>
-
-#include <errno.h>
-
-#ifdef QQNXFILEPICKER_DEBUG
-#define qFilePickerDebug qDebug
-#else
-#define qFilePickerDebug QT_NO_QDEBUG_MACRO
-#endif
-
-QT_BEGIN_NAMESPACE
-
-static const char s_filePickerTarget[] = "sys.filepicker.target";
-
-QQnxFilePicker::QQnxFilePicker(QObject *parent)
-    : QObject(parent)
-    , m_invocationHandle(0)
-    , m_mode(QQnxFilePicker::Picker)
-    , m_title(tr("Pick a file"))
-{
-    QCoreApplication::eventDispatcher()->installNativeEventFilter(this);
-}
-
-QQnxFilePicker::~QQnxFilePicker()
-{
-    cleanup();
-
-    QCoreApplication::eventDispatcher()->removeNativeEventFilter(this);
-}
-
-void QQnxFilePicker::open()
-{
-    if (m_invocationHandle)
-        return;
-
-    // Clear any previous results
-    m_selectedFiles.clear();
-
-    int errorCode = BPS_SUCCESS;
-
-    errorCode = navigator_invoke_invocation_create(&m_invocationHandle);
-    if (errorCode != BPS_SUCCESS) {
-        qWarning() << "QQnxFilePicker: unable to create invocation:" << strerror(errno);
-        return;
-    }
-
-    errorCode = navigator_invoke_invocation_set_target(m_invocationHandle, s_filePickerTarget);
-
-    if (errorCode != BPS_SUCCESS) {
-        cleanup();
-        qWarning() << "QQnxFilePicker: unable to set target:" << strerror(errno);
-        return;
-    }
-
-    errorCode = navigator_invoke_invocation_set_action(m_invocationHandle, "bb.action.OPEN");
-    if (errorCode != BPS_SUCCESS) {
-        cleanup();
-        qWarning() << "QQnxFilePicker: unable to set action:" << strerror(errno);
-        return;
-    }
-
-    errorCode = navigator_invoke_invocation_set_type(m_invocationHandle, "application/vnd.blackberry.file_picker");
-    if (errorCode != BPS_SUCCESS) {
-        cleanup();
-        qWarning() << "QQnxFilePicker: unable to set mime type:" << strerror(errno);
-        return;
-    }
-
-    QVariantMap map;
-    map[QStringLiteral("Type")] = filePickerType();
-    map[QStringLiteral("Mode")] = modeToString(m_mode);
-    map[QStringLiteral("Title")] = m_title;
-    map[QStringLiteral("ViewMode")] = QStringLiteral("Default");
-    map[QStringLiteral("SortBy")] = QStringLiteral("Default");
-    map[QStringLiteral("SortOrder")] = QStringLiteral("Default");
-    map[QStringLiteral("ImageCrop")] = false;
-    map[QStringLiteral("AllowOverwrite")] = false;
-
-    if (!m_defaultSaveFileNames.isEmpty())
-        map[QStringLiteral("DefaultFileNames")] = m_defaultSaveFileNames.join(QLatin1Char(','));
-    if (!m_filters.isEmpty())
-        map[QStringLiteral("Filter")] = m_filters.join(QLatin1Char(';'));
-
-    QByteArray ppsData;
-    ppsData = QPpsObject::encode(map);
-
-    errorCode = navigator_invoke_invocation_set_data(m_invocationHandle, ppsData.constData(), ppsData.size());
-    if (errorCode != BPS_SUCCESS) {
-        cleanup();
-        qWarning() << "QQnxFilePicker: unable to set data:" << strerror(errno);
-        return;
-    }
-
-    navigator_invoke_invocation_send(m_invocationHandle);
-}
-
-void QQnxFilePicker::close()
-{
-    navigator_card_close_child();
-    cleanup();
-}
-
-bool QQnxFilePicker::nativeEventFilter(const QByteArray&, void *message, long*)
-{
-    bps_event_t * const event = static_cast<bps_event_t*>(message);
-    if (!event)
-        return false;
-
-    if (bps_event_get_code(event) == NAVIGATOR_INVOKE_TARGET_RESULT) {
-        const char *id = navigator_event_get_id(event);
-        const char *err = navigator_event_get_err(event);
-        qFilePickerDebug("received invocation response: id=%s err=%s", id, err);
-    } else if (bps_event_get_code(event) == NAVIGATOR_CHILD_CARD_CLOSED) {
-        const char *data = navigator_event_get_card_closed_data(event);
-        qFilePickerDebug("received data: data='%s'", data);
-        handleFilePickerResponse(data);
-    }
-
-    return false; // do not drop the event
-}
-
-void QQnxFilePicker::setMode(QQnxFilePicker::Mode mode)
-{
-    m_mode = mode;
-}
-
-void QQnxFilePicker::setDefaultSaveFileNames(const QStringList &fileNames)
-{
-    m_defaultSaveFileNames = fileNames;
-}
-
-void QQnxFilePicker::addDefaultSaveFileName(const QString &fileName)
-{
-    m_defaultSaveFileNames.append(fileName);
-}
-
-void QQnxFilePicker::setDirectories(const QStringList &directories)
-{
-    m_directories = directories;
-}
-
-void QQnxFilePicker::addDirectory(const QString &directory)
-{
-    m_directories.append(directory);
-}
-
-void QQnxFilePicker::setFilters(const QStringList &filters)
-{
-    m_filters = filters;
-}
-
-void QQnxFilePicker::setTitle(const QString &title)
-{
-    m_title = title;
-}
-
-QQnxFilePicker::Mode QQnxFilePicker::mode() const
-{
-    return m_mode;
-}
-
-QStringList QQnxFilePicker::defaultSaveFileNames() const
-{
-    return m_defaultSaveFileNames;
-}
-
-QStringList QQnxFilePicker::directories() const
-{
-    return m_directories;
-}
-
-QStringList QQnxFilePicker::filters() const
-{
-    return m_filters;
-}
-
-QStringList QQnxFilePicker::selectedFiles() const
-{
-    return m_selectedFiles;
-}
-
-QString QQnxFilePicker::title() const
-{
-    return m_title;
-}
-
-void QQnxFilePicker::cleanup()
-{
-    if (m_invocationHandle) {
-        navigator_invoke_invocation_destroy(m_invocationHandle);
-        m_invocationHandle = 0;
-    }
-}
-
-void QQnxFilePicker::handleFilePickerResponse(const char *data)
-{
-    QJsonParseError jsonError;
-    QJsonDocument document = QJsonDocument::fromJson(data, &jsonError);
-
-    if (jsonError.error != QJsonParseError::NoError) {
-        qFilePickerDebug() << "Error parsing FilePicker response: "
-                 << jsonError.errorString();
-        Q_EMIT closed();
-        cleanup();
-        return;
-    }
-
-    // The response is a list of Json objects.
-    const QVariantList array = document.array().toVariantList();
-
-    foreach (const QVariant &variant, array) {
-        const QJsonObject object = QJsonObject::fromVariantMap(variant.toMap());
-        const QUrl url(object.value(QStringLiteral("uri")).toString());
-        const QString localFile = url.toLocalFile(); // strip "file://"
-
-        if (!localFile.isEmpty())
-            m_selectedFiles << localFile;
-
-        qFilePickerDebug() << "FilePicker uri response:" << localFile;
-    }
-
-    Q_EMIT closed();
-    cleanup();
-}
-
-QString QQnxFilePicker::filePickerType() const
-{
-    bool images = false;
-    bool video = false;
-    bool music = false;
-    QMimeDatabase mimeDb;
-    for (int i = 0; i < m_filters.count(); i++) {
-        QList<QMimeType> mimeTypes = mimeDb.mimeTypesForFileName(m_filters.at(i));
-        if (mimeTypes.isEmpty())
-            return QStringLiteral("Other");
-
-        if (mimeTypes.first().name().startsWith(QLatin1String("image")))
-            images = true;
-        else if (mimeTypes.first().name().startsWith(QLatin1String("audio")))
-            music = true;
-        else if (mimeTypes.first().name().startsWith(QLatin1String("video")))
-            video = true;
-        else
-            return QStringLiteral("Other");
-    }
-
-    if (!video && !music)
-        return QStringLiteral("Picture");
-
-    if (!images && !music)
-        return QStringLiteral("Video");
-
-    if (!images && !video)
-        return QStringLiteral("Music");
-
-    return QStringLiteral("Other");
-}
-
-QString QQnxFilePicker::modeToString(QQnxFilePicker::Mode mode) const
-{
-    switch (mode) {
-    case Picker:
-        return QStringLiteral("Picker");
-    case Saver:
-        return QStringLiteral("Saver");
-    case PickerMultiple:
-        return QStringLiteral("PickerMultiple");
-    case SaverMultiple:
-        return QStringLiteral("SaverMultiple");
-    }
-
-    return QStringLiteral("Picker");
-}
-
-QT_END_NAMESPACE
diff --git a/src/plugins/platforms/qnx/qqnxfilepicker.h b/src/plugins/platforms/qnx/qqnxfilepicker.h
deleted file mode 100644
index 7e4f9010cc..0000000000
--- a/src/plugins/platforms/qnx/qqnxfilepicker.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/***************************************************************************
-**
-** Copyright (C) 2013 Research In Motion
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QQNXFILEPICKER_H
-#define QQNXFILEPICKER_H
-
-#include <QAbstractNativeEventFilter>
-#include <QObject>
-#include <QStringList>
-
-QT_BEGIN_NAMESPACE
-
-struct navigator_invoke_invocation_t;
-
-class QQnxFilePicker : public QObject, public QAbstractNativeEventFilter
-{
-    Q_OBJECT
-
-public:
-    explicit QQnxFilePicker(QObject *parent = 0);
-    ~QQnxFilePicker();
-
-    enum Mode {
-        Picker,
-        Saver,
-        PickerMultiple,
-        SaverMultiple
-    };
-
-    bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) Q_DECL_OVERRIDE;
-
-    void setMode(Mode mode);
-    void setDefaultSaveFileNames(const QStringList &fileNames);
-    void addDefaultSaveFileName(const QString &fileName);
-    void setDirectories(const QStringList &directories);
-    void addDirectory(const QString &directory);
-    void setFilters(const QStringList &filters);
-    void setTitle(const QString &title);
-
-    Mode mode() const;
-
-    QStringList defaultSaveFileNames() const;
-    QStringList directories() const;
-    QStringList filters() const;
-    QStringList selectedFiles() const;
-
-    QString title() const;
-
-Q_SIGNALS:
-    void closed();
-
-public Q_SLOTS:
-    void open();
-    void close();
-
-private:
-    void cleanup();
-    void handleFilePickerResponse(const char *data);
-    QString filePickerType() const;
-
-    QString modeToString(Mode mode) const;
-
-    navigator_invoke_invocation_t *m_invocationHandle;
-
-    Mode m_mode;
-
-    QStringList m_defaultSaveFileNames;
-    QStringList m_directories;
-    QStringList m_filters;
-    QStringList m_selectedFiles;
-
-    QString m_title;
-};
-
-QT_END_NAMESPACE
-
-#endif // QQNXFILEPICKER_H
diff --git a/src/plugins/platforms/qnx/qqnxintegration.cpp b/src/plugins/platforms/qnx/qqnxintegration.cpp
index 1c825dbbdd..57f8213a4e 100644
--- a/src/plugins/platforms/qnx/qqnxintegration.cpp
+++ b/src/plugins/platforms/qnx/qqnxintegration.cpp
@@ -52,12 +52,7 @@
 #include "qqnxeglwindow.h"
 #endif
 
-#if defined(Q_OS_BLACKBERRY)
-#include "qqnxbpseventfilter.h"
-#include "qqnxnavigatorbps.h"
-#include "qblackberrytheme.h"
-#include "qqnxvirtualkeyboardbps.h"
-#elif defined(QQNX_PPS)
+#if defined(QQNX_PPS)
 #include "qqnxnavigatorpps.h"
 #include "qqnxnavigatoreventnotifier.h"
 #include "qqnxvirtualkeyboardpps.h"
@@ -75,12 +70,7 @@
 #endif
 
 #include "private/qgenericunixfontdatabase_p.h"
-
-#if defined(Q_OS_BLACKBERRY)
-#include "qqnxeventdispatcher_blackberry.h"
-#else
 #include "private/qgenericunixeventdispatcher_p.h"
-#endif
 
 #include <qpa/qplatformwindow.h>
 #include <qpa/qwindowsysteminterface.h>
@@ -120,16 +110,10 @@ static inline QQnxIntegration::Options parseOptions(const QStringList &paramList
         options |= QQnxIntegration::AlwaysFlushScreenContext;
     }
 
-// On Blackberry the first window is treated as a root window
-#ifdef Q_OS_BLACKBERRY
-    if (!paramList.contains(QLatin1String("no-rootwindow"))) {
-        options |= QQnxIntegration::RootWindow;
-    }
-#else
     if (paramList.contains(QLatin1String("rootwindow"))) {
         options |= QQnxIntegration::RootWindow;
     }
-#endif
+
     return options;
 }
 
@@ -147,12 +131,7 @@ QQnxIntegration::QQnxIntegration(const QStringList &paramList)
 #endif
     , m_services(0)
     , m_fontDatabase(new QGenericUnixFontDatabase())
-#if defined(Q_OS_BLACKBERRY)
-    , m_eventDispatcher(new QQnxEventDispatcherBlackberry())
-    , m_bpsEventFilter(0)
-#else
     , m_eventDispatcher(createUnixEventDispatcher())
-#endif
     , m_nativeInterface(new QQnxNativeInterface(this))
     , m_screenEventHandler(new QQnxScreenEventHandler(this))
 #if !defined(QT_NO_CLIPBOARD)
@@ -169,8 +148,7 @@ QQnxIntegration::QQnxIntegration(const QStringList &paramList)
     Q_SCREEN_CRITICALERROR(screen_create_context(&ms_screenContext, SCREEN_APPLICATION_CONTEXT),
                            "Failed to create screen context");
 
-    // Not on BlackBerry, it has specialized event dispatcher which also handles navigator events
-#if !defined(Q_OS_BLACKBERRY) && defined(QQNX_PPS)
+#if defined(QQNX_PPS)
     // Create/start navigator event notifier
     m_navigatorEventNotifier = new QQnxNavigatorEventNotifier(m_navigatorEventHandler);
 
@@ -190,8 +168,7 @@ QQnxIntegration::QQnxIntegration(const QStringList &paramList)
     m_screenEventThread->start();
 #endif
 
-    // Not on BlackBerry, it has specialized event dispatcher which also handles virtual keyboard events
-#if !defined(Q_OS_BLACKBERRY) && defined(QQNX_PPS)
+#if defined(QQNX_PPS)
     // Create/start the keyboard class.
     m_virtualKeyboard = new QQnxVirtualKeyboardPps();
 
@@ -200,9 +177,7 @@ QQnxIntegration::QQnxIntegration(const QStringList &paramList)
     QMetaObject::invokeMethod(m_virtualKeyboard, "start", Qt::QueuedConnection);
 #endif
 
-#if defined(Q_OS_BLACKBERRY)
-    m_navigator = new QQnxNavigatorBps();
-#elif defined(QQNX_PPS)
+#if defined(QQNX_PPS)
     m_navigator = new QQnxNavigatorPps();
 #endif
 
@@ -210,34 +185,8 @@ QQnxIntegration::QQnxIntegration(const QStringList &paramList)
     if (m_navigator)
         m_services = new QQnxServices(m_navigator);
 
-#if defined(Q_OS_BLACKBERRY)
-    QQnxVirtualKeyboardBps* virtualKeyboardBps = new QQnxVirtualKeyboardBps;
-
-#if defined(QQNX_SCREENEVENTTHREAD)
-    m_bpsEventFilter = new QQnxBpsEventFilter(m_navigatorEventHandler, 0, virtualKeyboardBps);
-#else
-    m_bpsEventFilter = new QQnxBpsEventFilter(m_navigatorEventHandler, m_screenEventHandler, virtualKeyboardBps);
-#endif
-
-    m_bpsEventFilter->installOnEventDispatcher(m_eventDispatcher);
-
-    m_virtualKeyboard = virtualKeyboardBps;
-#endif
-
-    // Create displays for all possible screens (which may not be attached). We have to do this
-    // *after* the call to m_bpsEventFilter->installOnEventDispatcher(m_eventDispatcher). The
-    // reason for this is that we have to be registered for NAVIGATOR events before we create the
-    // QQnxScreen objects, and hence the QQnxRootWindow's. It is when the NAVIGATOR service sees
-    // the window creation that it starts sending us messages which results in a race if we
-    // create the displays first.
     createDisplays();
 
-#if !defined(QQNX_SCREENEVENTTHREAD) && defined(Q_OS_BLACKBERRY)
-    // Register for screen domain events with bps
-    Q_FOREACH (QQnxScreen *screen, m_screens)
-        m_bpsEventFilter->registerForScreenEvents(screen);
-#endif
-
     if (m_virtualKeyboard) {
         // TODO check if we need to do this for all screens or only the primary one
         QObject::connect(m_virtualKeyboard, SIGNAL(heightChanged(int)),
@@ -275,7 +224,7 @@ QQnxIntegration::~QQnxIntegration()
 #endif
 
     // Stop/destroy navigator event notifier
-#if !defined(Q_OS_BLACKBERRY) && defined(QQNX_PPS)
+#if defined(QQNX_PPS)
     delete m_navigatorEventNotifier;
 #endif
     delete m_navigatorEventHandler;
@@ -283,13 +232,6 @@ QQnxIntegration::~QQnxIntegration()
 #if defined(QQNX_SCREENEVENTTHREAD)
     // Stop/destroy screen event thread
     delete m_screenEventThread;
-#elif defined(Q_OS_BLACKBERRY)
-    Q_FOREACH (QQnxScreen *screen, m_screens)
-        m_bpsEventFilter->unregisterForScreenEvents(screen);
-#endif
-
-#if defined(Q_OS_BLACKBERRY)
-    delete m_bpsEventFilter;
 #endif
 
     // In case the event-dispatcher was never transferred to QCoreApplication
@@ -450,21 +392,6 @@ QPlatformServices * QQnxIntegration::services() const
     return m_services;
 }
 
-#if defined(Q_OS_BLACKBERRY)
-QStringList QQnxIntegration::themeNames() const
-{
-    return QStringList(QBlackberryTheme::name());
-}
-
-QPlatformTheme *QQnxIntegration::createPlatformTheme(const QString &name) const
-{
-    qIntegrationDebug() << Q_FUNC_INFO << "name =" << name;
-    if (name == QBlackberryTheme::name())
-        return new QBlackberryTheme(this);
-    return 0;
-}
-#endif
-
 QWindow *QQnxIntegration::window(screen_window_t qnxWindow)
 {
     qIntegrationDebug() << Q_FUNC_INFO;
@@ -601,7 +528,7 @@ QQnxIntegration::Options QQnxIntegration::ms_options = 0;
 
 bool QQnxIntegration::supportsNavigatorEvents() const
 {
-    // If QQNX_PPS or Q_OS_BLACKBERRY is defined then we have navigator
+    // If QQNX_PPS is defined then we have navigator
     return m_navigator != 0;
 }
 
diff --git a/src/plugins/platforms/qnx/qqnxintegration.h b/src/plugins/platforms/qnx/qqnxintegration.h
index 04250cdba0..3a4a1380ab 100644
--- a/src/plugins/platforms/qnx/qqnxintegration.h
+++ b/src/plugins/platforms/qnx/qqnxintegration.h
@@ -42,7 +42,6 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQnxBpsEventFilter;
 #if defined(QQNX_SCREENEVENTTHREAD)
 class QQnxScreenEventThread;
 #endif
@@ -117,12 +116,6 @@ public:
 
     QPlatformServices *services() const;
 
-#if defined(Q_OS_BLACKBERRY)
-    QStringList themeNames() const;
-    QPlatformTheme *createPlatformTheme(const QString &name) const;
-    QQnxBpsEventFilter *bpsEventFilter() const { return m_bpsEventFilter; }
-#endif
-
     static QWindow *window(screen_window_t qnxWindow);
 
     QQnxScreen *screenForNative(screen_display_t qnxScreen) const;
@@ -156,9 +149,6 @@ private:
     QQnxServices *m_services;
     QPlatformFontDatabase *m_fontDatabase;
     mutable QAbstractEventDispatcher *m_eventDispatcher;
-#if defined(Q_OS_BLACKBERRY)
-    QQnxBpsEventFilter *m_bpsEventFilter;
-#endif
     QQnxNativeInterface *m_nativeInterface;
     QList<QQnxScreen*> m_screens;
     QQnxScreenEventHandler *m_screenEventHandler;
diff --git a/src/plugins/platforms/qnx/qqnxnativeinterface.cpp b/src/plugins/platforms/qnx/qqnxnativeinterface.cpp
index 549e0209bf..8c22f7cea0 100644
--- a/src/plugins/platforms/qnx/qqnxnativeinterface.cpp
+++ b/src/plugins/platforms/qnx/qqnxnativeinterface.cpp
@@ -85,11 +85,6 @@ void *QQnxNativeInterface::nativeResourceForScreen(const QByteArray &resource, Q
 
 void *QQnxNativeInterface::nativeResourceForIntegration(const QByteArray &resource)
 {
-#ifdef Q_OS_BLACKBERRY
-    if (resource == "navigatorEventHandler")
-        return m_integration->navigatorEventHandler();
-#endif
-
     return 0;
 }
 
diff --git a/src/plugins/platforms/qnx/qqnxnavigatorbps.cpp b/src/plugins/platforms/qnx/qqnxnavigatorbps.cpp
deleted file mode 100644
index 67f936a8dd..0000000000
--- a/src/plugins/platforms/qnx/qqnxnavigatorbps.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/***************************************************************************
-**
-** Copyright (C) 2012 Research In Motion
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qqnxnavigatorbps.h"
-
-#include <QDebug>
-
-#include <bps/navigator.h>
-
-QT_BEGIN_NAMESPACE
-
-QQnxNavigatorBps::QQnxNavigatorBps(QObject *parent)
-    : QQnxAbstractNavigator(parent)
-{
-    bps_initialize();
-}
-
-QQnxNavigatorBps::~QQnxNavigatorBps()
-{
-    bps_shutdown();
-}
-
-bool QQnxNavigatorBps::requestInvokeUrl(const QByteArray &encodedUrl)
-{
-    char *error = 0;
-
-    int ret = navigator_invoke(encodedUrl, &error);
-    if (error) {
-        qWarning() << Q_FUNC_INFO << "error=" << error;
-        bps_free(error);
-    }
-
-    return (ret == BPS_SUCCESS);
-}
-
-QT_END_NAMESPACE
diff --git a/src/plugins/platforms/qnx/qqnxnavigatorbps.h b/src/plugins/platforms/qnx/qqnxnavigatorbps.h
deleted file mode 100644
index b006695de6..0000000000
--- a/src/plugins/platforms/qnx/qqnxnavigatorbps.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/***************************************************************************
-**
-** Copyright (C) 2012 Research In Motion
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QQNXNAVIGATORBPS_H
-#define QQNXNAVIGATORBPS_H
-
-#include "qqnxabstractnavigator.h"
-
-QT_BEGIN_NAMESPACE
-
-class QQnxNavigatorBps : public QQnxAbstractNavigator
-{
-    Q_OBJECT
-public:
-    explicit QQnxNavigatorBps(QObject *parent = 0);
-    ~QQnxNavigatorBps();
-
-protected:
-    bool requestInvokeUrl(const QByteArray &encodedUrl);
-};
-
-QT_END_NAMESPACE
-
-#endif // QQNXNAVIGATORBPS_H
diff --git a/src/plugins/platforms/qnx/qqnxnavigatorcover.cpp b/src/plugins/platforms/qnx/qqnxnavigatorcover.cpp
deleted file mode 100644
index 6d30677b30..0000000000
--- a/src/plugins/platforms/qnx/qqnxnavigatorcover.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-/***************************************************************************
-**
-** Copyright (C) 2013 BlackBerry Limited. All rights reserved.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qqnxnavigatorcover.h"
-
-QQnxNavigatorCover::QQnxNavigatorCover()
-{
-    navigator_window_cover_attribute_create(&m_coverAttribute);
-}
-
-QQnxNavigatorCover::~QQnxNavigatorCover()
-{
-    if (m_coverAttribute)
-        navigator_window_cover_attribute_destroy(m_coverAttribute);
-
-    navigator_window_cover_reset();
-}
-
-void QQnxNavigatorCover::updateCover()
-{
-    if (m_coverAttribute) {
-        navigator_window_cover_attribute_set_transition(m_coverAttribute,
-                                                        NAVIGATOR_WINDOW_COVER_TRANSITION_NONE);
-        navigator_window_cover_attribute_set_alternate_window(m_coverAttribute);
-        navigator_window_cover_update(m_coverAttribute);
-    }
-}
diff --git a/src/plugins/platforms/qnx/qqnxnavigatorcover.h b/src/plugins/platforms/qnx/qqnxnavigatorcover.h
deleted file mode 100644
index 5e9ed9f7bd..0000000000
--- a/src/plugins/platforms/qnx/qqnxnavigatorcover.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/***************************************************************************
-**
-** Copyright (C) 2013 BlackBerry Limited. All rights reserved.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QQNXNAVIGATORCOVER_H
-#define QQNXNAVIGATORCOVER_H
-
-#include "qqnxabstractcover.h"
-#include <bps/navigator.h>
-
-class QQnxNavigatorCover : public QQnxAbstractCover
-{
-public:
-    QQnxNavigatorCover();
-    ~QQnxNavigatorCover();
-
-    void updateCover();
-
-private:
-    navigator_window_cover_attribute_t *m_coverAttribute;
-};
-
-#endif // QQNXNAVIGATORCOVER_H
diff --git a/src/plugins/platforms/qnx/qqnxscreen.cpp b/src/plugins/platforms/qnx/qqnxscreen.cpp
index 85c7a91dec..7fe60b4dd5 100644
--- a/src/plugins/platforms/qnx/qqnxscreen.cpp
+++ b/src/plugins/platforms/qnx/qqnxscreen.cpp
@@ -584,10 +584,6 @@ void QQnxScreen::addWindow(QQnxWindow *window)
         else
             m_childWindows.push_back(window);
         updateHierarchy();
-    } else {
-#if defined(Q_OS_BLACKBERRY)
-        m_coverWindow = window;
-#endif
     }
 }
 
diff --git a/src/plugins/platforms/qnx/qqnxscreeneventhandler.cpp b/src/plugins/platforms/qnx/qqnxscreeneventhandler.cpp
index 9fa397cb6a..4baabbb4fa 100644
--- a/src/plugins/platforms/qnx/qqnxscreeneventhandler.cpp
+++ b/src/plugins/platforms/qnx/qqnxscreeneventhandler.cpp
@@ -254,13 +254,8 @@ void QQnxScreenEventHandler::handleKeyboardEvent(screen_event_t event)
                         "Failed to query event cap");
 
     int sequenceId = 0;
-#if defined(Q_OS_BLACKBERRY)
-    Q_SCREEN_CHECKERROR(
-            screen_get_event_property_iv(event, SCREEN_PROPERTY_SEQUENCE_ID, &sequenceId),
-            "Failed to query event seqId");
-#endif
-
     bool inject = true;
+
     Q_FOREACH (QQnxScreenEventFilter *filter, m_eventFilters) {
         if (filter->handleKeyboardEvent(flags, sym, modifiers, scan, cap, sequenceId)) {
             inject = false;
diff --git a/src/plugins/platforms/qnx/qqnxsystemsettings.cpp b/src/plugins/platforms/qnx/qqnxsystemsettings.cpp
deleted file mode 100644
index 243630ec85..0000000000
--- a/src/plugins/platforms/qnx/qqnxsystemsettings.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-/***************************************************************************
-**
-** Copyright (C) 2012 Research In Motion
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qqnxsystemsettings.h"
-
-#include <QFont>
-#include <qpa/qplatformfontdatabase.h>
-
-QT_BEGIN_NAMESPACE
-
-QHash<QPlatformTheme::Font, QFont *> qt_qnx_createRoleFonts(QPlatformFontDatabase *fontDatabase)
-{
-    // See http://docs.blackberry.com/en/developers/deliverables/41577/typography.jsp
-    // which recommends using
-    // - small font size of 6 points
-    // - normal font size of 8 points
-    // - 11 points for titles (not covered by the theme system).
-    QFont baseFont = fontDatabase->defaultFont();
-    baseFont.setPointSize(8);
-
-    QHash<QPlatformTheme::Font, QFont *> fonts;
-    fonts.insert(QPlatformTheme::SystemFont, new QFont(baseFont));
-    fonts.insert(QPlatformTheme::PushButtonFont, new QFont(baseFont));
-    fonts.insert(QPlatformTheme::ListViewFont, new QFont(baseFont));
-    fonts.insert(QPlatformTheme::ListBoxFont, new QFont(baseFont));
-    fonts.insert(QPlatformTheme::TitleBarFont, new QFont(baseFont));
-    fonts.insert(QPlatformTheme::MenuFont, new QFont(baseFont));
-    fonts.insert(QPlatformTheme::ComboMenuItemFont, new QFont(baseFont));
-    fonts.insert(QPlatformTheme::HeaderViewFont, new QFont(baseFont));
-    fonts.insert(QPlatformTheme::TipLabelFont, new QFont(baseFont));
-    fonts.insert(QPlatformTheme::LabelFont, new QFont(baseFont));
-    fonts.insert(QPlatformTheme::ToolButtonFont, new QFont(baseFont));
-    fonts.insert(QPlatformTheme::MenuItemFont, new QFont(baseFont));
-    fonts.insert(QPlatformTheme::ComboLineEditFont, new QFont(baseFont));
-
-    QFont smallFont(baseFont);
-    smallFont.setPointSize(6);
-    fonts.insert(QPlatformTheme::SmallFont, new QFont(smallFont));
-    fonts.insert(QPlatformTheme::MiniFont, new QFont(smallFont));
-
-    return fonts;
-}
-
-QT_END_NAMESPACE
diff --git a/src/plugins/platforms/qnx/qqnxsystemsettings.h b/src/plugins/platforms/qnx/qqnxsystemsettings.h
deleted file mode 100644
index 6a99d5a70c..0000000000
--- a/src/plugins/platforms/qnx/qqnxsystemsettings.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/***************************************************************************
-**
-** Copyright (C) 2012 Research In Motion
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QQNXSYSTEMSETTINGS_H
-#define QQNXSYSTEMSETTINGS_H
-
-#include <QtCore/qhash.h>
-#include <qpa/qplatformtheme.h>
-
-QT_BEGIN_NAMESPACE
-
-class QPlatformFontDatabase;
-
-QHash<QPlatformTheme::Font, QFont *> qt_qnx_createRoleFonts(QPlatformFontDatabase *fontDatabase);
-
-QT_END_NAMESPACE
-
-#endif // QQNXSYSTEMSETTINGS_H
diff --git a/src/plugins/platforms/qnx/qqnxvirtualkeyboardbps.cpp b/src/plugins/platforms/qnx/qqnxvirtualkeyboardbps.cpp
deleted file mode 100644
index 3d749b486d..0000000000
--- a/src/plugins/platforms/qnx/qqnxvirtualkeyboardbps.cpp
+++ /dev/null
@@ -1,217 +0,0 @@
-/***************************************************************************
-**
-** Copyright (C) 2013 BlackBerry Limited. All rights reserved.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qqnxvirtualkeyboardbps.h"
-
-#include <QDebug>
-
-#include <bps/event.h>
-#include <bps/locale.h>
-#include <bps/virtualkeyboard.h>
-#if defined(Q_OS_BLACKBERRY)
-#include <bbndk.h>
-#endif
-
-#if defined(QQNXVIRTUALKEYBOARD_DEBUG)
-#define qVirtualKeyboardDebug qDebug
-#else
-#define qVirtualKeyboardDebug QT_NO_QDEBUG_MACRO
-#endif
-
-QT_BEGIN_NAMESPACE
-
-QQnxVirtualKeyboardBps::QQnxVirtualKeyboardBps(QObject *parent)
-    : QQnxAbstractVirtualKeyboard(parent)
-{
-    if (locale_request_events(0) != BPS_SUCCESS)
-        qWarning("QQNX: Failed to register for locale events");
-
-    if (virtualkeyboard_request_events(0) != BPS_SUCCESS)
-        qWarning("QQNX: Failed to register for virtual keyboard events");
-
-    int height = 0;
-    if (virtualkeyboard_get_height(&height) != BPS_SUCCESS)
-        qWarning("QQNX: Failed to get virtual keyboard height");
-
-    setHeight(height);
-}
-
-bool QQnxVirtualKeyboardBps::handleEvent(bps_event_t *event)
-{
-    const int eventDomain = bps_event_get_domain(event);
-    if (eventDomain == locale_get_domain())
-        return handleLocaleEvent(event);
-
-    if (eventDomain == virtualkeyboard_get_domain())
-        return handleVirtualKeyboardEvent(event);
-
-    return false;
-}
-
-bool QQnxVirtualKeyboardBps::showKeyboard()
-{
-    qVirtualKeyboardDebug() << Q_FUNC_INFO << "current visibility=" << isVisible();
-
-    // They keyboard's mode is global between applications, we have to set it each time
-    if ( !isVisible() )
-        applyKeyboardOptions();
-
-    virtualkeyboard_show();
-    return true;
-}
-
-bool QQnxVirtualKeyboardBps::hideKeyboard()
-{
-    qVirtualKeyboardDebug() << Q_FUNC_INFO << "current visibility=" << isVisible();
-    virtualkeyboard_hide();
-    return true;
-}
-
-void QQnxVirtualKeyboardBps::applyKeyboardOptions()
-{
-    virtualkeyboard_layout_t layout = keyboardLayout();
-    virtualkeyboard_enter_t enter = enterKey();
-
-    qVirtualKeyboardDebug() << Q_FUNC_INFO << "mode=" << keyboardMode() << "enterKey=" << enterKeyType();
-
-    virtualkeyboard_change_options(layout, enter);
-}
-
-virtualkeyboard_layout_t QQnxVirtualKeyboardBps::keyboardLayout() const
-{
-    switch (keyboardMode()) {
-    case Url:
-        return VIRTUALKEYBOARD_LAYOUT_URL;
-    case Email:
-        return VIRTUALKEYBOARD_LAYOUT_EMAIL;
-    case Web:
-        return VIRTUALKEYBOARD_LAYOUT_WEB;
-    case NumPunc:
-        return VIRTUALKEYBOARD_LAYOUT_NUM_PUNC;
-    case Number:
-        return VIRTUALKEYBOARD_LAYOUT_NUMBER;
-    case Symbol:
-        return VIRTUALKEYBOARD_LAYOUT_SYMBOL;
-    case Phone:
-        return VIRTUALKEYBOARD_LAYOUT_PHONE;
-    case Pin:
-        return VIRTUALKEYBOARD_LAYOUT_PIN;
-    case Password:
-        return VIRTUALKEYBOARD_LAYOUT_PASSWORD;
-#if defined(Q_OS_BLACKBERRY)
-#if BBNDK_VERSION_AT_LEAST(10, 2, 1)
-    case Alphanumeric:
-        return VIRTUALKEYBOARD_LAYOUT_ALPHANUMERIC;
-#endif
-#endif
-    case Default: // fall through
-    default:
-        return VIRTUALKEYBOARD_LAYOUT_DEFAULT;
-    }
-
-    return VIRTUALKEYBOARD_LAYOUT_DEFAULT;
-}
-
-virtualkeyboard_enter_t QQnxVirtualKeyboardBps::enterKey() const
-{
-    switch (enterKeyType()) {
-    case Connect:
-        return VIRTUALKEYBOARD_ENTER_CONNECT;
-    case Done:
-        return VIRTUALKEYBOARD_ENTER_DONE;
-    case Go:
-        return VIRTUALKEYBOARD_ENTER_GO;
-    case Join:
-        return VIRTUALKEYBOARD_ENTER_JOIN;
-    case Next:
-        return VIRTUALKEYBOARD_ENTER_NEXT;
-    case Search:
-        return VIRTUALKEYBOARD_ENTER_SEARCH;
-    case Send:
-        return VIRTUALKEYBOARD_ENTER_SEND;
-    case Submit:
-        return VIRTUALKEYBOARD_ENTER_SUBMIT;
-    case Default: // fall through
-    default:
-        return VIRTUALKEYBOARD_ENTER_DEFAULT;
-    }
-
-    return VIRTUALKEYBOARD_ENTER_DEFAULT;
-}
-
-bool QQnxVirtualKeyboardBps::handleLocaleEvent(bps_event_t *event)
-{
-    if (bps_event_get_code(event) == LOCALE_INFO) {
-        const QString language = QString::fromLatin1(locale_event_get_language(event));
-        const QString country  = QString::fromLatin1(locale_event_get_country(event));
-        const QLocale newLocale(language + QLatin1Char('_') + country);
-
-        qVirtualKeyboardDebug() << Q_FUNC_INFO << "current locale" << locale() << "new locale=" << newLocale;
-        setLocale(newLocale);
-        return true;
-    }
-
-    qVirtualKeyboardDebug() << Q_FUNC_INFO << "Unhandled locale event. code=" << bps_event_get_code(event);
-
-    return false;
-}
-
-bool QQnxVirtualKeyboardBps::handleVirtualKeyboardEvent(bps_event_t *event)
-{
-    switch (bps_event_get_code(event)) {
-    case VIRTUALKEYBOARD_EVENT_VISIBLE:
-        qVirtualKeyboardDebug() << Q_FUNC_INFO << "EVENT VISIBLE: current visibility=" << isVisible();
-        setVisible(true);
-        break;
-
-    case VIRTUALKEYBOARD_EVENT_HIDDEN:
-        qVirtualKeyboardDebug() << Q_FUNC_INFO << "EVENT HIDDEN: current visibility=" << isVisible();
-        setVisible(false);
-        break;
-
-    case VIRTUALKEYBOARD_EVENT_INFO: {
-        const int newHeight = virtualkeyboard_event_get_height(event);
-        qVirtualKeyboardDebug() << Q_FUNC_INFO << "EVENT INFO: current height=" << height() << "new height=" << newHeight;
-        setHeight(newHeight);
-        break;
-    }
-
-    default:
-        qVirtualKeyboardDebug() << Q_FUNC_INFO << "Unhandled virtual keyboard event. code=" << bps_event_get_code(event);
-        return false;
-    }
-
-    return true;
-}
-
-QT_END_NAMESPACE
diff --git a/src/plugins/platforms/qnx/qqnxvirtualkeyboardbps.h b/src/plugins/platforms/qnx/qqnxvirtualkeyboardbps.h
deleted file mode 100644
index a720c5d894..0000000000
--- a/src/plugins/platforms/qnx/qqnxvirtualkeyboardbps.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/***************************************************************************
-**
-** Copyright (C) 2012 Research In Motion
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QQNXVIRTUALKEYBOARDBPS_H
-#define QQNXVIRTUALKEYBOARDBPS_H
-
-#include "qqnxabstractvirtualkeyboard.h"
-#include <bps/virtualkeyboard.h>
-
-struct bps_event_t;
-
-QT_BEGIN_NAMESPACE
-
-class QQnxVirtualKeyboardBps : public QQnxAbstractVirtualKeyboard
-{
-    Q_OBJECT
-public:
-    explicit QQnxVirtualKeyboardBps(QObject *parent = 0);
-
-    bool handleEvent(bps_event_t *event);
-
-    bool showKeyboard();
-    bool hideKeyboard();
-
-protected:
-    void applyKeyboardOptions();
-
-private:
-    bool handleLocaleEvent(bps_event_t *event);
-    bool handleVirtualKeyboardEvent(bps_event_t *event);
-
-    virtualkeyboard_layout_t keyboardLayout() const;
-    virtualkeyboard_enter_t enterKey() const;
-};
-
-QT_END_NAMESPACE
-
-#endif // QQNXVIRTUALKEYBOARDBPS_H
diff --git a/src/plugins/platforms/qnx/qqnxwindow.cpp b/src/plugins/platforms/qnx/qqnxwindow.cpp
index 3f92bcbc01..c081aa6d28 100644
--- a/src/plugins/platforms/qnx/qqnxwindow.cpp
+++ b/src/plugins/platforms/qnx/qqnxwindow.cpp
@@ -47,12 +47,6 @@
 
 #include <QtCore/QDebug>
 
-#if defined(Q_OS_BLACKBERRY)
-#include "qqnxnavigatorcover.h"
-#include <sys/pps.h>
-#include <bps/navigator.h>
-#endif
-
 #include <errno.h>
 
 #if defined(QQNXWINDOW_DEBUG)
@@ -633,23 +627,7 @@ QQnxWindow *QQnxWindow::findWindow(screen_window_t windowHandle)
 
 void QQnxWindow::minimize()
 {
-#if defined(Q_OS_BLACKBERRY)
-    qWindowDebug() << Q_FUNC_INFO;
-
-    pps_encoder_t encoder;
-
-    pps_encoder_initialize(&encoder, false);
-    pps_encoder_add_string(&encoder, "msg", "minimizeWindow");
-
-    if (navigator_raw_write(pps_encoder_buffer(&encoder),
-                pps_encoder_length(&encoder)) != BPS_SUCCESS) {
-        qWindowDebug() << Q_FUNC_INFO << "navigator_raw_write failed:" << strerror(errno);
-    }
-
-    pps_encoder_cleanup(&encoder);
-#else
     qWarning("Qt::WindowMinimized is not supported by this OS version");
-#endif
 }
 
 void QQnxWindow::setRotation(int rotation)
@@ -686,18 +664,8 @@ void QQnxWindow::initWindow()
     QQnxScreen *platformScreen = static_cast<QQnxScreen *>(window()->screen()->handle());
     setScreen(platformScreen);
 
-    if (window()->type() == Qt::CoverWindow) {
-#if defined(Q_OS_BLACKBERRY)
-        if (platformScreen->rootWindow()) {
-            screen_set_window_property_pv(m_screen->rootWindow()->nativeHandle(),
-                                          SCREEN_PROPERTY_ALTERNATE_WINDOW, (void**)&m_window);
-            m_cover.reset(new QQnxNavigatorCover);
-        } else {
-            qWarning("No root window for cover window");
-        }
-#endif
+    if (window()->type() == Qt::CoverWindow)
         m_exposed = false;
-    }
 
     // Add window to plugin's window mapper
     QQnxIntegration::addWindow(m_window, window());
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index 03b7dc266b..55660ce31c 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -8,7 +8,6 @@ qtHaveModule(gui) {
     !contains(QT_DISABLED_FEATURES, imageformatplugin): SUBDIRS *= imageformats
     !contains(QT_DISABLED_FEATURES, library): SUBDIRS *= generic
 }
-qtHaveModule(widgets): SUBDIRS *= styles
 
 !winrt:!wince*:qtHaveModule(widgets):!contains(QT_DISABLED_FEATURES, printer) {
     SUBDIRS += printsupport
diff --git a/src/plugins/styles/bb10style/bb10lightstyle.qrc b/src/plugins/styles/bb10style/bb10lightstyle.qrc
deleted file mode 100644
index 0777e009bb..0000000000
--- a/src/plugins/styles/bb10style/bb10lightstyle.qrc
+++ /dev/null
@@ -1,54 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file>light/button/core_button_disabled.png</file>
-        <file>light/button/core_button_inactive.png</file>
-        <file>light/button/core_button_pressed.png</file>
-        <file>light/checkbox/core_checkbox_checked.png</file>
-        <file>light/checkbox/core_checkbox_disabled.png</file>
-        <file>light/checkbox/core_checkbox_disabledchecked.png</file>
-        <file>light/checkbox/core_checkbox_enabled.png</file>
-        <file>light/checkbox/core_checkbox_pressed.png</file>
-        <file>light/checkbox/core_checkbox_pressedchecked.png</file>
-        <file>light/radiobutton/core_radiobutton_checked.png</file>
-        <file>light/radiobutton/core_radiobutton_disabled.png</file>
-        <file>light/radiobutton/core_radiobutton_disabledchecked.png</file>
-        <file>light/radiobutton/core_radiobutton_enabled.png</file>
-        <file>light/radiobutton/core_radiobutton_pressed.png</file>
-        <file>light/slider/core_slider_active.png</file>
-        <file>light/slider/core_slider_disabled.png</file>
-        <file>light/slider/core_slider_handle.png</file>
-        <file>light/slider/core_slider_handle_disabled.png</file>
-        <file>light/slider/core_slider_handle_pressed.png</file>
-        <file>light/slider/core_slider_inactive.png</file>
-        <file>light/slider/core_slider_vactive.png</file>
-        <file>light/slider/core_slider_vdisabled.png</file>
-        <file>light/slider/core_slider_vinactive.png</file>
-        <file>light/slider/core_slider_black.png</file>
-        <file>light/slider/core_slider_enabled.png</file>
-        <file>light/slider/core_slider_vblack.png</file>
-        <file>light/slider/core_slider_venabled.png</file>
-        <file>light/button/core_button_active.png</file>
-        <file>light/lineedit/core_textinput_bg.png</file>
-        <file>light/lineedit/core_textinput_bg_disabled.png</file>
-        <file>light/lineedit/core_textinput_bg_focused.png</file>
-        <file>light/progressbar/core_progressindicator_bg.png</file>
-        <file>light/progressbar/core_progressindicator_complete.png</file>
-        <file>light/progressbar/core_progressindicator_fill.png</file>
-        <file>light/progressbar/core_progressindicator_vbg.png</file>
-        <file>light/progressbar/core_progressindicator_vcomplete.png</file>
-        <file>light/progressbar/core_progressindicator_vfill.png</file>
-        <file>light/combobox/core_dropdown_button.png</file>
-        <file>light/combobox/core_dropdown_button_arrowdown.png</file>
-        <file>light/combobox/core_dropdown_button_arrowdown_pressed.png</file>
-        <file>light/combobox/core_dropdown_button_arrowup.png</file>
-        <file>light/combobox/core_dropdown_button_disabled.png</file>
-        <file>light/combobox/core_dropdown_button_pressed.png</file>
-        <file>light/combobox/core_dropdown_checkmark.png</file>
-        <file>light/combobox/core_dropdown_divider.png</file>
-        <file>light/combobox/core_dropdown_menu.png</file>
-        <file>light/combobox/core_dropdown_menuup.png</file>
-        <file>light/combobox/core_listitem_active.png</file>
-        <file>light/listitem/core_listitem_active.png</file>
-        <file>light/listitem/core_listitem_divider.png</file>
-    </qresource>
-</RCC>
diff --git a/src/plugins/styles/bb10style/bb10style.pro b/src/plugins/styles/bb10style/bb10style.pro
deleted file mode 100644
index 7cee788031..0000000000
--- a/src/plugins/styles/bb10style/bb10style.pro
+++ /dev/null
@@ -1,26 +0,0 @@
-TARGET = bb10styleplugin
-
-PLUGIN_TYPE = styles
-PLUGIN_CLASS_NAME = BlackBerry10StylePlugin
-load(qt_plugin)
-
-INCLUDEPATH += $$PWD
-
-QT += widgets
-
-HEADERS += \
-    qbb10brightstyle.h \
-    qbb10darkstyle.h \
-    qbb10styleplugin.h
-
-SOURCES += \
-    qbb10brightstyle.cpp \
-    qbb10darkstyle.cpp \
-    qbb10styleplugin.cpp
-
-RESOURCES += \
-    qbb10brightstyle.qrc \
-    qbb10darkstyle.qrc
-
-OTHER_FILES += qbb10styleplugin.json
-
diff --git a/src/plugins/styles/bb10style/bright/button/core_button_disabled.png b/src/plugins/styles/bb10style/bright/button/core_button_disabled.png
deleted file mode 100644
index 578a2383b8..0000000000
--- a/src/plugins/styles/bb10style/bright/button/core_button_disabled.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/bright/button/core_button_disabled_selected.png b/src/plugins/styles/bb10style/bright/button/core_button_disabled_selected.png
deleted file mode 100644
index 7cd998af46..0000000000
--- a/src/plugins/styles/bb10style/bright/button/core_button_disabled_selected.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/bright/button/core_button_enabled_selected.png b/src/plugins/styles/bb10style/bright/button/core_button_enabled_selected.png
deleted file mode 100644
index ff0850f616..0000000000
--- a/src/plugins/styles/bb10style/bright/button/core_button_enabled_selected.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/bright/button/core_button_inactive.png b/src/plugins/styles/bb10style/bright/button/core_button_inactive.png
deleted file mode 100644
index 7769f15e44..0000000000
--- a/src/plugins/styles/bb10style/bright/button/core_button_inactive.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/bright/button/core_button_pressed.png b/src/plugins/styles/bb10style/bright/button/core_button_pressed.png
deleted file mode 100644
index 59b5bfa7c2..0000000000
--- a/src/plugins/styles/bb10style/bright/button/core_button_pressed.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/bright/checkbox/core_checkbox_checked.png b/src/plugins/styles/bb10style/bright/checkbox/core_checkbox_checked.png
deleted file mode 100644
index c59f60633c..0000000000
--- a/src/plugins/styles/bb10style/bright/checkbox/core_checkbox_checked.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/bright/checkbox/core_checkbox_disabled.png b/src/plugins/styles/bb10style/bright/checkbox/core_checkbox_disabled.png
deleted file mode 100644
index 49d9cfdf94..0000000000
--- a/src/plugins/styles/bb10style/bright/checkbox/core_checkbox_disabled.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/bright/checkbox/core_checkbox_disabled_checked.png b/src/plugins/styles/bb10style/bright/checkbox/core_checkbox_disabled_checked.png
deleted file mode 100644
index 35751553e1..0000000000
--- a/src/plugins/styles/bb10style/bright/checkbox/core_checkbox_disabled_checked.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/bright/checkbox/core_checkbox_enabled.png b/src/plugins/styles/bb10style/bright/checkbox/core_checkbox_enabled.png
deleted file mode 100644
index 2a0c56b503..0000000000
--- a/src/plugins/styles/bb10style/bright/checkbox/core_checkbox_enabled.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/bright/checkbox/core_checkbox_pressed.png b/src/plugins/styles/bb10style/bright/checkbox/core_checkbox_pressed.png
deleted file mode 100644
index f1c2ee3bed..0000000000
--- a/src/plugins/styles/bb10style/bright/checkbox/core_checkbox_pressed.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/bright/checkbox/core_checkbox_pressed_checked.png b/src/plugins/styles/bb10style/bright/checkbox/core_checkbox_pressed_checked.png
deleted file mode 100644
index d58df47cbf..0000000000
--- a/src/plugins/styles/bb10style/bright/checkbox/core_checkbox_pressed_checked.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/bright/combobox/core_dropdown_button.png b/src/plugins/styles/bb10style/bright/combobox/core_dropdown_button.png
deleted file mode 100644
index 1aa844309f..0000000000
--- a/src/plugins/styles/bb10style/bright/combobox/core_dropdown_button.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/bright/combobox/core_dropdown_button_arrowdown.png b/src/plugins/styles/bb10style/bright/combobox/core_dropdown_button_arrowdown.png
deleted file mode 100644
index 9ac049fb3d..0000000000
--- a/src/plugins/styles/bb10style/bright/combobox/core_dropdown_button_arrowdown.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/bright/combobox/core_dropdown_button_arrowdown_pressed.png b/src/plugins/styles/bb10style/bright/combobox/core_dropdown_button_arrowdown_pressed.png
deleted file mode 100644
index d11af56b71..0000000000
--- a/src/plugins/styles/bb10style/bright/combobox/core_dropdown_button_arrowdown_pressed.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/bright/combobox/core_dropdown_button_arrowup.png b/src/plugins/styles/bb10style/bright/combobox/core_dropdown_button_arrowup.png
deleted file mode 100644
index d10779d8d7..0000000000
--- a/src/plugins/styles/bb10style/bright/combobox/core_dropdown_button_arrowup.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/bright/combobox/core_dropdown_button_disabled.png b/src/plugins/styles/bb10style/bright/combobox/core_dropdown_button_disabled.png
deleted file mode 100644
index f9e1c9465b..0000000000
--- a/src/plugins/styles/bb10style/bright/combobox/core_dropdown_button_disabled.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/bright/combobox/core_dropdown_button_pressed.png b/src/plugins/styles/bb10style/bright/combobox/core_dropdown_button_pressed.png
deleted file mode 100644
index 27a321e387..0000000000
--- a/src/plugins/styles/bb10style/bright/combobox/core_dropdown_button_pressed.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/bright/combobox/core_dropdown_checkmark.png b/src/plugins/styles/bb10style/bright/combobox/core_dropdown_checkmark.png
deleted file mode 100644
index a8270aed56..0000000000
--- a/src/plugins/styles/bb10style/bright/combobox/core_dropdown_checkmark.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/bright/combobox/core_dropdown_divider.png b/src/plugins/styles/bb10style/bright/combobox/core_dropdown_divider.png
deleted file mode 100644
index 0198293ad6..0000000000
--- a/src/plugins/styles/bb10style/bright/combobox/core_dropdown_divider.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/bright/combobox/core_dropdown_menu.png b/src/plugins/styles/bb10style/bright/combobox/core_dropdown_menu.png
deleted file mode 100644
index 47e7b2d4b6..0000000000
--- a/src/plugins/styles/bb10style/bright/combobox/core_dropdown_menu.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/bright/combobox/core_dropdown_menuup.png b/src/plugins/styles/bb10style/bright/combobox/core_dropdown_menuup.png
deleted file mode 100644
index 2bde84e71d..0000000000
--- a/src/plugins/styles/bb10style/bright/combobox/core_dropdown_menuup.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/bright/combobox/core_listitem_active.png b/src/plugins/styles/bb10style/bright/combobox/core_listitem_active.png
deleted file mode 100644
index 4935d13c05..0000000000
--- a/src/plugins/styles/bb10style/bright/combobox/core_listitem_active.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/bright/lineedit/core_textinput_bg.png b/src/plugins/styles/bb10style/bright/lineedit/core_textinput_bg.png
deleted file mode 100644
index 07b8ea21bf..0000000000
--- a/src/plugins/styles/bb10style/bright/lineedit/core_textinput_bg.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/bright/lineedit/core_textinput_bg_disabled.png b/src/plugins/styles/bb10style/bright/lineedit/core_textinput_bg_disabled.png
deleted file mode 100644
index ab1083e9fa..0000000000
--- a/src/plugins/styles/bb10style/bright/lineedit/core_textinput_bg_disabled.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/bright/lineedit/core_textinput_bg_highlight.png b/src/plugins/styles/bb10style/bright/lineedit/core_textinput_bg_highlight.png
deleted file mode 100644
index 55f8aee066..0000000000
--- a/src/plugins/styles/bb10style/bright/lineedit/core_textinput_bg_highlight.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/bright/listitem/core_listitem_active.png b/src/plugins/styles/bb10style/bright/listitem/core_listitem_active.png
deleted file mode 100644
index 34daccc27e..0000000000
--- a/src/plugins/styles/bb10style/bright/listitem/core_listitem_active.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/bright/listitem/core_listitem_divider.png b/src/plugins/styles/bb10style/bright/listitem/core_listitem_divider.png
deleted file mode 100644
index 7a1e22321d..0000000000
--- a/src/plugins/styles/bb10style/bright/listitem/core_listitem_divider.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/bright/progressbar/core_progressindicator_bg.png b/src/plugins/styles/bb10style/bright/progressbar/core_progressindicator_bg.png
deleted file mode 100644
index 3ff930dea7..0000000000
--- a/src/plugins/styles/bb10style/bright/progressbar/core_progressindicator_bg.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/bright/progressbar/core_progressindicator_complete.png b/src/plugins/styles/bb10style/bright/progressbar/core_progressindicator_complete.png
deleted file mode 100644
index 87974668ff..0000000000
--- a/src/plugins/styles/bb10style/bright/progressbar/core_progressindicator_complete.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/bright/progressbar/core_progressindicator_fill.png b/src/plugins/styles/bb10style/bright/progressbar/core_progressindicator_fill.png
deleted file mode 100644
index 8ff257dad3..0000000000
--- a/src/plugins/styles/bb10style/bright/progressbar/core_progressindicator_fill.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/bright/progressbar/core_progressindicator_vbg.png b/src/plugins/styles/bb10style/bright/progressbar/core_progressindicator_vbg.png
deleted file mode 100644
index 66cf8cac8f..0000000000
--- a/src/plugins/styles/bb10style/bright/progressbar/core_progressindicator_vbg.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/bright/progressbar/core_progressindicator_vcomplete.png b/src/plugins/styles/bb10style/bright/progressbar/core_progressindicator_vcomplete.png
deleted file mode 100644
index f18e0abafb..0000000000
--- a/src/plugins/styles/bb10style/bright/progressbar/core_progressindicator_vcomplete.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/bright/progressbar/core_progressindicator_vfill.png b/src/plugins/styles/bb10style/bright/progressbar/core_progressindicator_vfill.png
deleted file mode 100644
index 94e388a7aa..0000000000
--- a/src/plugins/styles/bb10style/bright/progressbar/core_progressindicator_vfill.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/bright/radiobutton/core_radiobutton_checked.png b/src/plugins/styles/bb10style/bright/radiobutton/core_radiobutton_checked.png
deleted file mode 100644
index 5dc5e52d88..0000000000
--- a/src/plugins/styles/bb10style/bright/radiobutton/core_radiobutton_checked.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/bright/radiobutton/core_radiobutton_disabled.png b/src/plugins/styles/bb10style/bright/radiobutton/core_radiobutton_disabled.png
deleted file mode 100644
index 077aa79c65..0000000000
--- a/src/plugins/styles/bb10style/bright/radiobutton/core_radiobutton_disabled.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/bright/radiobutton/core_radiobutton_disabled_checked.png b/src/plugins/styles/bb10style/bright/radiobutton/core_radiobutton_disabled_checked.png
deleted file mode 100644
index 439499040a..0000000000
--- a/src/plugins/styles/bb10style/bright/radiobutton/core_radiobutton_disabled_checked.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/bright/radiobutton/core_radiobutton_inactive.png b/src/plugins/styles/bb10style/bright/radiobutton/core_radiobutton_inactive.png
deleted file mode 100644
index cb4c6a8136..0000000000
--- a/src/plugins/styles/bb10style/bright/radiobutton/core_radiobutton_inactive.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/bright/radiobutton/core_radiobutton_pressed.png b/src/plugins/styles/bb10style/bright/radiobutton/core_radiobutton_pressed.png
deleted file mode 100644
index 88fd1344d2..0000000000
--- a/src/plugins/styles/bb10style/bright/radiobutton/core_radiobutton_pressed.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/bright/scrollbar/core_scrollbar.png b/src/plugins/styles/bb10style/bright/scrollbar/core_scrollbar.png
deleted file mode 100644
index 79154e0568..0000000000
--- a/src/plugins/styles/bb10style/bright/scrollbar/core_scrollbar.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/bright/scrollbar/core_scrollbar_v.png b/src/plugins/styles/bb10style/bright/scrollbar/core_scrollbar_v.png
deleted file mode 100644
index 169a4e1656..0000000000
--- a/src/plugins/styles/bb10style/bright/scrollbar/core_scrollbar_v.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/bright/slider/core_slider_active.png b/src/plugins/styles/bb10style/bright/slider/core_slider_active.png
deleted file mode 100644
index c23c0ebc26..0000000000
--- a/src/plugins/styles/bb10style/bright/slider/core_slider_active.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/bright/slider/core_slider_cache.png b/src/plugins/styles/bb10style/bright/slider/core_slider_cache.png
deleted file mode 100644
index 6b7224d702..0000000000
--- a/src/plugins/styles/bb10style/bright/slider/core_slider_cache.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/bright/slider/core_slider_disabled.png b/src/plugins/styles/bb10style/bright/slider/core_slider_disabled.png
deleted file mode 100644
index 9de7567e68..0000000000
--- a/src/plugins/styles/bb10style/bright/slider/core_slider_disabled.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/bright/slider/core_slider_enabled.png b/src/plugins/styles/bb10style/bright/slider/core_slider_enabled.png
deleted file mode 100644
index ad5c35076c..0000000000
--- a/src/plugins/styles/bb10style/bright/slider/core_slider_enabled.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/bright/slider/core_slider_handle.png b/src/plugins/styles/bb10style/bright/slider/core_slider_handle.png
deleted file mode 100644
index 076e272794..0000000000
--- a/src/plugins/styles/bb10style/bright/slider/core_slider_handle.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/bright/slider/core_slider_handle_disabled.png b/src/plugins/styles/bb10style/bright/slider/core_slider_handle_disabled.png
deleted file mode 100644
index 5989fcaaeb..0000000000
--- a/src/plugins/styles/bb10style/bright/slider/core_slider_handle_disabled.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/bright/slider/core_slider_handle_pressed.png b/src/plugins/styles/bb10style/bright/slider/core_slider_handle_pressed.png
deleted file mode 100644
index 8cb79118b9..0000000000
--- a/src/plugins/styles/bb10style/bright/slider/core_slider_handle_pressed.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/bright/slider/core_slider_inactive.png b/src/plugins/styles/bb10style/bright/slider/core_slider_inactive.png
deleted file mode 100644
index 8836534923..0000000000
--- a/src/plugins/styles/bb10style/bright/slider/core_slider_inactive.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/bright/slider/core_slider_vactive.png b/src/plugins/styles/bb10style/bright/slider/core_slider_vactive.png
deleted file mode 100644
index 03062326f2..0000000000
--- a/src/plugins/styles/bb10style/bright/slider/core_slider_vactive.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/bright/slider/core_slider_vcache.png b/src/plugins/styles/bb10style/bright/slider/core_slider_vcache.png
deleted file mode 100644
index b0d94d7127..0000000000
--- a/src/plugins/styles/bb10style/bright/slider/core_slider_vcache.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/bright/slider/core_slider_vdisabled.png b/src/plugins/styles/bb10style/bright/slider/core_slider_vdisabled.png
deleted file mode 100644
index ce99b1a3ac..0000000000
--- a/src/plugins/styles/bb10style/bright/slider/core_slider_vdisabled.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/bright/slider/core_slider_venabled.png b/src/plugins/styles/bb10style/bright/slider/core_slider_venabled.png
deleted file mode 100644
index 910b6627d4..0000000000
--- a/src/plugins/styles/bb10style/bright/slider/core_slider_venabled.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/bright/slider/core_slider_vinactive.png b/src/plugins/styles/bb10style/bright/slider/core_slider_vinactive.png
deleted file mode 100644
index 18a9819af8..0000000000
--- a/src/plugins/styles/bb10style/bright/slider/core_slider_vinactive.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/dark/button/core_button_disabled.png b/src/plugins/styles/bb10style/dark/button/core_button_disabled.png
deleted file mode 100644
index 79245dbf11..0000000000
--- a/src/plugins/styles/bb10style/dark/button/core_button_disabled.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/dark/button/core_button_disabled_selected.png b/src/plugins/styles/bb10style/dark/button/core_button_disabled_selected.png
deleted file mode 100644
index 5eb86b70f3..0000000000
--- a/src/plugins/styles/bb10style/dark/button/core_button_disabled_selected.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/dark/button/core_button_enabled_selected.png b/src/plugins/styles/bb10style/dark/button/core_button_enabled_selected.png
deleted file mode 100644
index 7b1a6ce40b..0000000000
--- a/src/plugins/styles/bb10style/dark/button/core_button_enabled_selected.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/dark/button/core_button_inactive.png b/src/plugins/styles/bb10style/dark/button/core_button_inactive.png
deleted file mode 100644
index 97842e1ac4..0000000000
--- a/src/plugins/styles/bb10style/dark/button/core_button_inactive.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/dark/button/core_button_pressed.png b/src/plugins/styles/bb10style/dark/button/core_button_pressed.png
deleted file mode 100644
index c149b64a26..0000000000
--- a/src/plugins/styles/bb10style/dark/button/core_button_pressed.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/dark/checkbox/core_checkbox_checked.png b/src/plugins/styles/bb10style/dark/checkbox/core_checkbox_checked.png
deleted file mode 100644
index 5a8af33094..0000000000
--- a/src/plugins/styles/bb10style/dark/checkbox/core_checkbox_checked.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/dark/checkbox/core_checkbox_disabled.png b/src/plugins/styles/bb10style/dark/checkbox/core_checkbox_disabled.png
deleted file mode 100644
index 74a24522fa..0000000000
--- a/src/plugins/styles/bb10style/dark/checkbox/core_checkbox_disabled.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/dark/checkbox/core_checkbox_disabled_checked.png b/src/plugins/styles/bb10style/dark/checkbox/core_checkbox_disabled_checked.png
deleted file mode 100644
index 1e953221b6..0000000000
--- a/src/plugins/styles/bb10style/dark/checkbox/core_checkbox_disabled_checked.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/dark/checkbox/core_checkbox_enabled.png b/src/plugins/styles/bb10style/dark/checkbox/core_checkbox_enabled.png
deleted file mode 100644
index 5e51e7f39b..0000000000
--- a/src/plugins/styles/bb10style/dark/checkbox/core_checkbox_enabled.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/dark/checkbox/core_checkbox_pressed.png b/src/plugins/styles/bb10style/dark/checkbox/core_checkbox_pressed.png
deleted file mode 100644
index 507a77b3ea..0000000000
--- a/src/plugins/styles/bb10style/dark/checkbox/core_checkbox_pressed.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/dark/checkbox/core_checkbox_pressed_checked.png b/src/plugins/styles/bb10style/dark/checkbox/core_checkbox_pressed_checked.png
deleted file mode 100644
index 7fa85428a0..0000000000
--- a/src/plugins/styles/bb10style/dark/checkbox/core_checkbox_pressed_checked.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/dark/combobox/core_dropdown_button.png b/src/plugins/styles/bb10style/dark/combobox/core_dropdown_button.png
deleted file mode 100644
index a68d93acb5..0000000000
--- a/src/plugins/styles/bb10style/dark/combobox/core_dropdown_button.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/dark/combobox/core_dropdown_button_arrowdown.png b/src/plugins/styles/bb10style/dark/combobox/core_dropdown_button_arrowdown.png
deleted file mode 100644
index 4c1d085360..0000000000
--- a/src/plugins/styles/bb10style/dark/combobox/core_dropdown_button_arrowdown.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/dark/combobox/core_dropdown_button_arrowdown_pressed.png b/src/plugins/styles/bb10style/dark/combobox/core_dropdown_button_arrowdown_pressed.png
deleted file mode 100644
index 1ee578e07c..0000000000
--- a/src/plugins/styles/bb10style/dark/combobox/core_dropdown_button_arrowdown_pressed.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/dark/combobox/core_dropdown_button_arrowup.png b/src/plugins/styles/bb10style/dark/combobox/core_dropdown_button_arrowup.png
deleted file mode 100644
index 3239ef4bd6..0000000000
--- a/src/plugins/styles/bb10style/dark/combobox/core_dropdown_button_arrowup.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/dark/combobox/core_dropdown_button_disabled.png b/src/plugins/styles/bb10style/dark/combobox/core_dropdown_button_disabled.png
deleted file mode 100644
index af6793b87c..0000000000
--- a/src/plugins/styles/bb10style/dark/combobox/core_dropdown_button_disabled.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/dark/combobox/core_dropdown_button_pressed.png b/src/plugins/styles/bb10style/dark/combobox/core_dropdown_button_pressed.png
deleted file mode 100644
index df6d402554..0000000000
--- a/src/plugins/styles/bb10style/dark/combobox/core_dropdown_button_pressed.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/dark/combobox/core_dropdown_checkmark.png b/src/plugins/styles/bb10style/dark/combobox/core_dropdown_checkmark.png
deleted file mode 100644
index 578c80aa5f..0000000000
--- a/src/plugins/styles/bb10style/dark/combobox/core_dropdown_checkmark.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/dark/combobox/core_dropdown_divider.png b/src/plugins/styles/bb10style/dark/combobox/core_dropdown_divider.png
deleted file mode 100644
index 43b1025d36..0000000000
--- a/src/plugins/styles/bb10style/dark/combobox/core_dropdown_divider.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/dark/combobox/core_dropdown_menu.png b/src/plugins/styles/bb10style/dark/combobox/core_dropdown_menu.png
deleted file mode 100644
index 1f52362050..0000000000
--- a/src/plugins/styles/bb10style/dark/combobox/core_dropdown_menu.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/dark/combobox/core_dropdown_menuup.png b/src/plugins/styles/bb10style/dark/combobox/core_dropdown_menuup.png
deleted file mode 100644
index 62c7a2e558..0000000000
--- a/src/plugins/styles/bb10style/dark/combobox/core_dropdown_menuup.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/dark/combobox/core_listitem_active.png b/src/plugins/styles/bb10style/dark/combobox/core_listitem_active.png
deleted file mode 100644
index 1df4a7aad9..0000000000
--- a/src/plugins/styles/bb10style/dark/combobox/core_listitem_active.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/dark/lineedit/core_textinput_bg.png b/src/plugins/styles/bb10style/dark/lineedit/core_textinput_bg.png
deleted file mode 100644
index 07b8ea21bf..0000000000
--- a/src/plugins/styles/bb10style/dark/lineedit/core_textinput_bg.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/dark/lineedit/core_textinput_bg_disabled.png b/src/plugins/styles/bb10style/dark/lineedit/core_textinput_bg_disabled.png
deleted file mode 100644
index 6bcaf91f87..0000000000
--- a/src/plugins/styles/bb10style/dark/lineedit/core_textinput_bg_disabled.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/dark/lineedit/core_textinput_bg_highlight.png b/src/plugins/styles/bb10style/dark/lineedit/core_textinput_bg_highlight.png
deleted file mode 100644
index 9b115897e8..0000000000
--- a/src/plugins/styles/bb10style/dark/lineedit/core_textinput_bg_highlight.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/dark/listitem/core_listitem_active.png b/src/plugins/styles/bb10style/dark/listitem/core_listitem_active.png
deleted file mode 100644
index 52aa4e4aa2..0000000000
--- a/src/plugins/styles/bb10style/dark/listitem/core_listitem_active.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/dark/listitem/core_listitem_divider.png b/src/plugins/styles/bb10style/dark/listitem/core_listitem_divider.png
deleted file mode 100644
index 39e3a8a4f5..0000000000
--- a/src/plugins/styles/bb10style/dark/listitem/core_listitem_divider.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/dark/progressbar/core_progressindicator_bg.png b/src/plugins/styles/bb10style/dark/progressbar/core_progressindicator_bg.png
deleted file mode 100644
index 95fcafb437..0000000000
--- a/src/plugins/styles/bb10style/dark/progressbar/core_progressindicator_bg.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/dark/progressbar/core_progressindicator_complete.png b/src/plugins/styles/bb10style/dark/progressbar/core_progressindicator_complete.png
deleted file mode 100644
index e849c8f179..0000000000
--- a/src/plugins/styles/bb10style/dark/progressbar/core_progressindicator_complete.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/dark/progressbar/core_progressindicator_fill.png b/src/plugins/styles/bb10style/dark/progressbar/core_progressindicator_fill.png
deleted file mode 100644
index e8fd3b0173..0000000000
--- a/src/plugins/styles/bb10style/dark/progressbar/core_progressindicator_fill.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/dark/progressbar/core_progressindicator_vbg.png b/src/plugins/styles/bb10style/dark/progressbar/core_progressindicator_vbg.png
deleted file mode 100644
index 1433f3ec33..0000000000
--- a/src/plugins/styles/bb10style/dark/progressbar/core_progressindicator_vbg.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/dark/progressbar/core_progressindicator_vcomplete.png b/src/plugins/styles/bb10style/dark/progressbar/core_progressindicator_vcomplete.png
deleted file mode 100644
index d750e4671c..0000000000
--- a/src/plugins/styles/bb10style/dark/progressbar/core_progressindicator_vcomplete.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/dark/progressbar/core_progressindicator_vfill.png b/src/plugins/styles/bb10style/dark/progressbar/core_progressindicator_vfill.png
deleted file mode 100644
index 2c3c0a5e6c..0000000000
--- a/src/plugins/styles/bb10style/dark/progressbar/core_progressindicator_vfill.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/dark/radiobutton/core_radiobutton_checked.png b/src/plugins/styles/bb10style/dark/radiobutton/core_radiobutton_checked.png
deleted file mode 100644
index 1721586ac5..0000000000
--- a/src/plugins/styles/bb10style/dark/radiobutton/core_radiobutton_checked.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/dark/radiobutton/core_radiobutton_disabled.png b/src/plugins/styles/bb10style/dark/radiobutton/core_radiobutton_disabled.png
deleted file mode 100644
index e646c9174b..0000000000
--- a/src/plugins/styles/bb10style/dark/radiobutton/core_radiobutton_disabled.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/dark/radiobutton/core_radiobutton_disabled_checked.png b/src/plugins/styles/bb10style/dark/radiobutton/core_radiobutton_disabled_checked.png
deleted file mode 100644
index 93b3118e8d..0000000000
--- a/src/plugins/styles/bb10style/dark/radiobutton/core_radiobutton_disabled_checked.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/dark/radiobutton/core_radiobutton_inactive.png b/src/plugins/styles/bb10style/dark/radiobutton/core_radiobutton_inactive.png
deleted file mode 100644
index fd61937d65..0000000000
--- a/src/plugins/styles/bb10style/dark/radiobutton/core_radiobutton_inactive.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/dark/radiobutton/core_radiobutton_pressed.png b/src/plugins/styles/bb10style/dark/radiobutton/core_radiobutton_pressed.png
deleted file mode 100644
index 58a1a57b4c..0000000000
--- a/src/plugins/styles/bb10style/dark/radiobutton/core_radiobutton_pressed.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/dark/scrollbar/core_scrollbar.png b/src/plugins/styles/bb10style/dark/scrollbar/core_scrollbar.png
deleted file mode 100644
index 384f60758a..0000000000
--- a/src/plugins/styles/bb10style/dark/scrollbar/core_scrollbar.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/dark/scrollbar/core_scrollbar_v.png b/src/plugins/styles/bb10style/dark/scrollbar/core_scrollbar_v.png
deleted file mode 100644
index 2542f2acaf..0000000000
--- a/src/plugins/styles/bb10style/dark/scrollbar/core_scrollbar_v.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/dark/slider/core_slider_active.png b/src/plugins/styles/bb10style/dark/slider/core_slider_active.png
deleted file mode 100644
index 6bdb413ced..0000000000
--- a/src/plugins/styles/bb10style/dark/slider/core_slider_active.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/dark/slider/core_slider_cache.png b/src/plugins/styles/bb10style/dark/slider/core_slider_cache.png
deleted file mode 100644
index eea5b3d78e..0000000000
--- a/src/plugins/styles/bb10style/dark/slider/core_slider_cache.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/dark/slider/core_slider_disabled.png b/src/plugins/styles/bb10style/dark/slider/core_slider_disabled.png
deleted file mode 100644
index 6a233315e4..0000000000
--- a/src/plugins/styles/bb10style/dark/slider/core_slider_disabled.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/dark/slider/core_slider_enabled.png b/src/plugins/styles/bb10style/dark/slider/core_slider_enabled.png
deleted file mode 100644
index 2b297e5ca2..0000000000
--- a/src/plugins/styles/bb10style/dark/slider/core_slider_enabled.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/dark/slider/core_slider_handle.png b/src/plugins/styles/bb10style/dark/slider/core_slider_handle.png
deleted file mode 100644
index fbd37e5584..0000000000
--- a/src/plugins/styles/bb10style/dark/slider/core_slider_handle.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/dark/slider/core_slider_handle_disabled.png b/src/plugins/styles/bb10style/dark/slider/core_slider_handle_disabled.png
deleted file mode 100644
index 49cb6a42a7..0000000000
--- a/src/plugins/styles/bb10style/dark/slider/core_slider_handle_disabled.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/dark/slider/core_slider_handle_pressed.png b/src/plugins/styles/bb10style/dark/slider/core_slider_handle_pressed.png
deleted file mode 100644
index 803c374015..0000000000
--- a/src/plugins/styles/bb10style/dark/slider/core_slider_handle_pressed.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/dark/slider/core_slider_inactive.png b/src/plugins/styles/bb10style/dark/slider/core_slider_inactive.png
deleted file mode 100644
index 08a1aecb6c..0000000000
--- a/src/plugins/styles/bb10style/dark/slider/core_slider_inactive.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/dark/slider/core_slider_vactive.png b/src/plugins/styles/bb10style/dark/slider/core_slider_vactive.png
deleted file mode 100644
index c8e467d9e6..0000000000
--- a/src/plugins/styles/bb10style/dark/slider/core_slider_vactive.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/dark/slider/core_slider_vcache.png b/src/plugins/styles/bb10style/dark/slider/core_slider_vcache.png
deleted file mode 100644
index ff160cbb1d..0000000000
--- a/src/plugins/styles/bb10style/dark/slider/core_slider_vcache.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/dark/slider/core_slider_vdisabled.png b/src/plugins/styles/bb10style/dark/slider/core_slider_vdisabled.png
deleted file mode 100644
index 27d348122b..0000000000
--- a/src/plugins/styles/bb10style/dark/slider/core_slider_vdisabled.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/dark/slider/core_slider_venabled.png b/src/plugins/styles/bb10style/dark/slider/core_slider_venabled.png
deleted file mode 100644
index ff8a74a19f..0000000000
--- a/src/plugins/styles/bb10style/dark/slider/core_slider_venabled.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/dark/slider/core_slider_vinactive.png b/src/plugins/styles/bb10style/dark/slider/core_slider_vinactive.png
deleted file mode 100644
index b2b19a5460..0000000000
--- a/src/plugins/styles/bb10style/dark/slider/core_slider_vinactive.png
+++ /dev/null
diff --git a/src/plugins/styles/bb10style/qbb10brightstyle.cpp b/src/plugins/styles/bb10style/qbb10brightstyle.cpp
deleted file mode 100644
index 9f14e3b134..0000000000
--- a/src/plugins/styles/bb10style/qbb10brightstyle.cpp
+++ /dev/null
@@ -1,344 +0,0 @@
-/***************************************************************************
-**
-** Copyright (C) 2014 BlackBerry Limited. All rights reserved.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qbb10brightstyle.h"
-
-#include <QApplication>
-#include <QFont>
-#include <QStyleOption>
-#include <QProgressBar>
-#include <QComboBox>
-#include <QAbstractItemView>
-#include <QPainter>
-
-QT_BEGIN_NAMESPACE
-
-QBB10BrightStyle::QBB10BrightStyle() :
-    QPixmapStyle()
-{
-    addDescriptor(PB_Enabled,
-                  QLatin1String("://bright/button/core_button_inactive.png"),
-                  QMargins(13, 13, 13, 13),
-                  QTileRules(Qt::RepeatTile, Qt::StretchTile));
-    addDescriptor(PB_Checked,
-                  QLatin1String("://bright/button/core_button_enabled_selected.png"),
-                  QMargins(13, 13, 13, 13),
-                  QTileRules(Qt::RepeatTile, Qt::StretchTile));
-    addDescriptor(PB_Pressed,
-                  QLatin1String("://bright/button/core_button_pressed.png"),
-                  QMargins(13, 13, 13, 13),
-                  QTileRules(Qt::RepeatTile, Qt::StretchTile));
-    addDescriptor(PB_Disabled,
-                  QLatin1String("://bright/button/core_button_disabled.png"),
-                  QMargins(13, 13, 13, 13),
-                  QTileRules(Qt::RepeatTile, Qt::StretchTile));
-    addDescriptor(PB_PressedDisabled,
-                  QLatin1String("://bright/button/core_button_disabled_selected.png"),
-                  QMargins(13, 13, 13, 13),
-                  QTileRules(Qt::RepeatTile, Qt::StretchTile));
-
-    addDescriptor(LE_Enabled,
-                  QLatin1String("://bright/lineedit/core_textinput_bg.png"),
-                  QMargins(8, 8, 8, 8));
-    addDescriptor(LE_Disabled,
-                  QLatin1String("://bright/lineedit/core_textinput_bg_disabled.png"),
-                  QMargins(8, 8, 8, 8));
-    addDescriptor(LE_Focused,
-                  QLatin1String("://bright/lineedit/core_textinput_bg_highlight.png"),
-                  QMargins(8, 8, 8, 8));
-
-    copyDescriptor(LE_Enabled, TE_Enabled);
-    copyDescriptor(LE_Disabled, TE_Disabled);
-    copyDescriptor(LE_Focused, TE_Focused);
-
-    addPixmap(CB_Enabled,
-              QLatin1String("://bright/checkbox/core_checkbox_enabled.png"),
-              QMargins(16, 16, 16, 16));
-    addPixmap(CB_Checked,
-              QLatin1String("://bright/checkbox/core_checkbox_checked.png"),
-              QMargins(16, 16, 16, 16));
-    addPixmap(CB_Pressed,
-              QLatin1String("://bright/checkbox/core_checkbox_pressed.png"),
-              QMargins(16, 16, 16, 16));
-    addPixmap(CB_PressedChecked,
-              QLatin1String("://bright/checkbox/core_checkbox_pressed_checked.png"),
-              QMargins(16, 16, 16, 16));
-    addPixmap(CB_Disabled,
-              QLatin1String("://bright/checkbox/core_checkbox_disabled.png"),
-              QMargins(16, 16, 16, 16));
-    addPixmap(CB_DisabledChecked,
-              QLatin1String("://bright/checkbox/core_checkbox_disabled_checked.png"),
-              QMargins(16, 16, 16, 16));
-
-    addPixmap(RB_Enabled,
-              QLatin1String("://bright/radiobutton/core_radiobutton_inactive.png"),
-              QMargins(16, 16, 16, 16));
-    addPixmap(RB_Checked,
-              QLatin1String("://bright/radiobutton/core_radiobutton_checked.png"),
-              QMargins(16, 16, 16, 16));
-    addPixmap(RB_Pressed,
-              QLatin1String("://bright/radiobutton/core_radiobutton_pressed.png"),
-              QMargins(16, 16, 16, 16));
-    addPixmap(RB_Disabled,
-              QLatin1String("://bright/radiobutton/core_radiobutton_disabled.png"),
-              QMargins(16, 16, 16, 16));
-    addPixmap(RB_DisabledChecked,
-              QLatin1String("://bright/radiobutton/core_radiobutton_disabled_checked.png"),
-              QMargins(16, 16, 16, 16));
-
-    addDescriptor(PB_HBackground,
-                  QLatin1String("://bright/progressbar/core_progressindicator_bg.png"),
-                  QMargins(10, 10, 10, 10),
-                  QTileRules(Qt::RepeatTile, Qt::StretchTile));
-    addDescriptor(PB_HContent,
-                  QLatin1String("://bright/progressbar/core_progressindicator_fill.png"),
-                  QMargins(10, 10, 10, 10),
-                  QTileRules(Qt::RepeatTile, Qt::StretchTile));
-    addDescriptor(PB_HComplete,
-                  QLatin1String("://bright/progressbar/core_progressindicator_complete.png"),
-                  QMargins(10, 10, 10, 10),
-                  QTileRules(Qt::RepeatTile, Qt::StretchTile));
-    addDescriptor(PB_VBackground,
-                  QLatin1String("://bright/progressbar/core_progressindicator_vbg.png"),
-                  QMargins(10, 10, 10, 10),
-                  QTileRules(Qt::StretchTile, Qt::RepeatTile));
-    addDescriptor(PB_VContent,
-                  QLatin1String("://bright/progressbar/core_progressindicator_vfill.png"),
-                  QMargins(10, 10, 10, 10),
-                  QTileRules(Qt::StretchTile, Qt::RepeatTile));
-    addDescriptor(PB_VComplete,
-                  QLatin1String("://bright/progressbar/core_progressindicator_vcomplete.png"),
-                  QMargins(10, 10, 10, 10),
-                  QTileRules(Qt::StretchTile, Qt::RepeatTile));
-
-    addDescriptor(SG_HEnabled,
-                  QLatin1String("://bright/slider/core_slider_enabled.png"),
-                  QMargins(50, 50, 50, 50),
-                  QTileRules(Qt::RepeatTile, Qt::StretchTile));
-    addDescriptor(SG_HDisabled,
-                  QLatin1String("://bright/slider/core_slider_disabled.png"),
-                  QMargins(50, 50, 50, 50),
-                  QTileRules(Qt::RepeatTile, Qt::StretchTile));
-    addDescriptor(SG_HActiveEnabled,
-                  QLatin1String("://bright/slider/core_slider_inactive.png"),
-                  QMargins(50, 50, 50, 50),
-                  QTileRules(Qt::RepeatTile, Qt::StretchTile));
-    addDescriptor(SG_HActivePressed,
-                  QLatin1String("://bright/slider/core_slider_active.png"),
-                  QMargins(50, 50, 50, 50),
-                  QTileRules(Qt::RepeatTile, Qt::StretchTile));
-    addDescriptor(SG_HActiveDisabled,
-                  QLatin1String("://bright/slider/core_slider_cache.png"),
-                  QMargins(50, 50, 50, 50),
-                  QTileRules(Qt::RepeatTile, Qt::StretchTile));
-    addDescriptor(SG_VEnabled,
-                  QLatin1String("://bright/slider/core_slider_venabled.png"),
-                  QMargins(50, 50, 50, 50),
-                  QTileRules(Qt::StretchTile, Qt::RepeatTile));
-    addDescriptor(SG_VDisabled,
-                  QLatin1String("://bright/slider/core_slider_vdisabled.png"),
-                  QMargins(50, 50, 50, 50),
-                  QTileRules(Qt::StretchTile, Qt::RepeatTile));
-    addDescriptor(SG_VActiveEnabled,
-                  QLatin1String("://bright/slider/core_slider_vinactive.png"),
-                  QMargins(50, 50, 50, 50),
-                  QTileRules(Qt::StretchTile, Qt::RepeatTile));
-    addDescriptor(SG_VActivePressed,
-                  QLatin1String("://bright/slider/core_slider_vactive.png"),
-                  QMargins(50, 50, 50, 50),
-                  QTileRules(Qt::StretchTile, Qt::RepeatTile));
-    addDescriptor(SG_VActiveDisabled,
-                  QLatin1String("://bright/slider/core_slider_vcache.png"),
-                  QMargins(50, 50, 50, 50),
-                  QTileRules(Qt::StretchTile, Qt::RepeatTile));
-
-    addPixmap(SH_HEnabled,
-                  QLatin1String("://bright/slider/core_slider_handle.png"));
-    addPixmap(SH_HDisabled,
-                  QLatin1String("://bright/slider/core_slider_handle_disabled.png"));
-    addPixmap(SH_HPressed,
-                  QLatin1String("://bright/slider/core_slider_handle_pressed.png"));
-    addPixmap(SH_VEnabled,
-                  QLatin1String("://bright/slider/core_slider_handle.png"));
-    addPixmap(SH_VDisabled,
-                  QLatin1String("://bright/slider/core_slider_handle_disabled.png"));
-    addPixmap(SH_VPressed,
-                  QLatin1String("://bright/slider/core_slider_handle_pressed.png"));
-
-    addDescriptor(DD_ButtonEnabled,
-                  QLatin1String("://bright/combobox/core_dropdown_button.png"),
-                  QMargins(14, 14, 14, 14),
-                  QTileRules(Qt::RepeatTile, Qt::StretchTile));
-    addDescriptor(DD_ButtonDisabled,
-                  QLatin1String("://bright/combobox/core_dropdown_button_disabled.png"),
-                  QMargins(14, 14, 14, 14),
-                  QTileRules(Qt::RepeatTile, Qt::StretchTile));
-    addDescriptor(DD_ButtonPressed,
-                  QLatin1String("://bright/combobox/core_dropdown_button_pressed.png"),
-                  QMargins(14, 14, 14, 14),
-                  QTileRules(Qt::RepeatTile, Qt::StretchTile));
-    addDescriptor(DD_ItemSelected,
-                  QLatin1String("://bright/combobox/core_listitem_active.png"));
-
-    addPixmap(DD_ArrowEnabled,
-                  QLatin1String("://bright/combobox/core_dropdown_button_arrowdown.png"),
-                  QMargins(35, 39, 35, 39));
-    copyPixmap(DD_ArrowEnabled, DD_ArrowDisabled);
-    addPixmap(DD_ArrowPressed,
-                  QLatin1String("://bright/combobox/core_dropdown_button_arrowdown_pressed.png"),
-                  QMargins(35, 39, 35, 39));
-    addPixmap(DD_ArrowOpen,
-                  QLatin1String("://bright/combobox/core_dropdown_button_arrowup.png"),
-                  QMargins(35, 39, 35, 39));
-    addDescriptor(DD_PopupDown,
-                  QLatin1String("://bright/combobox/core_dropdown_menu.png"),
-                  QMargins(12, 12, 12, 12),
-                  QTileRules(Qt::StretchTile, Qt::StretchTile));
-    addDescriptor(DD_PopupUp,
-                  QLatin1String("://bright/combobox/core_dropdown_menuup.png"),
-                  QMargins(12, 12, 12, 12),
-                  QTileRules(Qt::StretchTile, Qt::StretchTile));
-    addPixmap(DD_ItemSeparator,
-                  QLatin1String("://bright/combobox/core_dropdown_divider.png"),
-                  QMargins(5, 0, 5, 0));
-
-    addDescriptor(ID_Selected,
-                  QLatin1String("://bright/listitem/core_listitem_active.png"));
-    addPixmap(ID_Separator,
-                  QLatin1String("://bright/listitem/core_listitem_divider.png"));
-
-    addDescriptor(SB_Horizontal,
-                  QLatin1String("://bright/scrollbar/core_scrollbar.png"),
-                  QMargins(7, 8, 7, 8),
-                  QTileRules(Qt::RepeatTile, Qt::StretchTile));
-    addDescriptor(SB_Vertical,
-                  QLatin1String("://bright/scrollbar/core_scrollbar_v.png"),
-                  QMargins(8, 7, 8, 7),
-                  QTileRules(Qt::StretchTile, Qt::RepeatTile));
-}
-
-QBB10BrightStyle::~QBB10BrightStyle()
-{
-}
-
-void QBB10BrightStyle::polish(QApplication *application)
-{
-    QPixmapStyle::polish(application);
-}
-
-void QBB10BrightStyle::polish(QWidget *widget)
-{
-    // Hide the text by default
-    if (QProgressBar *pb = qobject_cast<QProgressBar*>(widget))
-        pb->setTextVisible(false);
-
-    if (QComboBox *cb = qobject_cast<QComboBox*>(widget)) {
-        QAbstractItemView *list = cb->view();
-        QPalette p = list->palette();
-        p.setBrush(QPalette::HighlightedText, p.brush(QPalette::Text));
-        list->setPalette(p);
-    }
-
-    if (qobject_cast<QAbstractItemView*>(widget)) {
-        QPalette p = widget->palette();
-        p.setBrush(QPalette::Disabled, QPalette::HighlightedText, p.brush(QPalette::Text));
-        widget->setPalette(p);
-    }
-
-    QPixmapStyle::polish(widget);
-}
-
-QPalette QBB10BrightStyle::standardPalette() const
-{
-    QPalette p;
-
-    QColor color = QColor(38, 38, 38);
-    p.setBrush(QPalette::ButtonText, color);
-    p.setBrush(QPalette::WindowText, color);
-    p.setBrush(QPalette::Text, color);
-
-    color.setAlpha(179);
-    p.setBrush(QPalette::Disabled, QPalette::ButtonText, color);
-    p.setBrush(QPalette::Disabled, QPalette::WindowText, color);
-    p.setBrush(QPalette::Disabled, QPalette::Text, color);
-
-    p.setColor(QPalette::Window, QColor(248, 248, 248));
-
-    p.setBrush(QPalette::Highlight, QColor(0, 168, 223));
-    p.setBrush(QPalette::HighlightedText, QColor(250, 250,250));
-
-    return p;
-}
-
-void QBB10BrightStyle::drawControl(QStyle::ControlElement element, const QStyleOption *option,
-                                  QPainter *painter, const QWidget *widget) const
-{
-    switch (element) {
-    case CE_PushButtonLabel:
-    {
-        const bool on = option->state & State_On || option->state & State_Sunken;
-        const QStyleOptionButton *button = qstyleoption_cast<const QStyleOptionButton*>(option);
-        QStyleOptionButton newOpt = *button;
-        if (on)
-            newOpt.palette.setBrush(QPalette::ButtonText, QColor(250, 250, 250));
-        QPixmapStyle::drawControl(CE_PushButtonLabel, &newOpt, painter, widget);
-        break;
-    }
-    case CE_ProgressBarLabel:
-        // Don't draw the progress bar label
-        break;
-    default:
-        QPixmapStyle::drawControl(element, option, painter, widget);
-    }
-}
-
-void QBB10BrightStyle::drawPrimitive(QStyle::PrimitiveElement element, const QStyleOption *option,
-                                    QPainter *painter, const QWidget *widget) const
-{
-    QPixmapStyle::drawPrimitive(element, option, painter, widget);
-
-    if (element == PE_PanelItemViewItem) {
-        // Draw the checkbox for current item
-        if (widget->property("_pixmap_combobox_list").toBool()
-                && option->state & QStyle::State_Selected) {
-            QPixmap pix(QLatin1String("://bright/combobox/core_dropdown_checkmark.png"));
-            QRect rect = option->rect;
-            const int margin = rect.height() / 2;
-            QPoint pos(rect.right() - margin - pix.width() / 2,
-                       rect.top() + margin - pix.height() / 2);
-            painter->drawPixmap(pos, pix);
-        }
-    }
-}
-
-QT_END_NAMESPACE
diff --git a/src/plugins/styles/bb10style/qbb10brightstyle.h b/src/plugins/styles/bb10style/qbb10brightstyle.h
deleted file mode 100644
index cc177370bc..0000000000
--- a/src/plugins/styles/bb10style/qbb10brightstyle.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/***************************************************************************
-**
-** Copyright (C) 2014 BlackBerry Limited. All rights reserved.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QBB10BRIGHTSTYLE_H
-#define QBB10BRIGHTSTYLE_H
-
-#include <QPixmapStyle>
-
-QT_BEGIN_NAMESPACE
-
-class QBB10BrightStyle : public QPixmapStyle
-{
-    Q_OBJECT
-
-public:
-    QBB10BrightStyle();
-    ~QBB10BrightStyle();
-
-    void polish(QApplication *application);
-    void polish(QWidget *widget);
-
-    QPalette standardPalette() const;
-
-    void drawControl(ControlElement element, const QStyleOption *option,
-            QPainter *painter, const QWidget *widget = 0) const;
-    void drawPrimitive(PrimitiveElement element, const QStyleOption *option,
-                       QPainter *painter, const QWidget *widget) const;
-};
-
-QT_END_NAMESPACE
-
-#endif // QBB10BRIGHTSTYLE_H
diff --git a/src/plugins/styles/bb10style/qbb10brightstyle.qrc b/src/plugins/styles/bb10style/qbb10brightstyle.qrc
deleted file mode 100644
index 2172536fa3..0000000000
--- a/src/plugins/styles/bb10style/qbb10brightstyle.qrc
+++ /dev/null
@@ -1,57 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file>bright/button/core_button_disabled.png</file>
-        <file>bright/button/core_button_disabled_selected.png</file>
-        <file>bright/button/core_button_inactive.png</file>
-        <file>bright/button/core_button_enabled_selected.png</file>
-        <file>bright/button/core_button_pressed.png</file>
-        <file>bright/checkbox/core_checkbox_checked.png</file>
-        <file>bright/checkbox/core_checkbox_disabled.png</file>
-        <file>bright/checkbox/core_checkbox_disabled_checked.png</file>
-        <file>bright/checkbox/core_checkbox_enabled.png</file>
-        <file>bright/checkbox/core_checkbox_pressed.png</file>
-        <file>bright/checkbox/core_checkbox_pressed_checked.png</file>
-        <file>bright/combobox/core_dropdown_button.png</file>
-        <file>bright/combobox/core_dropdown_button_arrowdown.png</file>
-        <file>bright/combobox/core_dropdown_button_arrowdown_pressed.png</file>
-        <file>bright/combobox/core_dropdown_button_arrowup.png</file>
-        <file>bright/combobox/core_dropdown_button_disabled.png</file>
-        <file>bright/combobox/core_dropdown_button_pressed.png</file>
-        <file>bright/combobox/core_dropdown_checkmark.png</file>
-        <file>bright/combobox/core_dropdown_divider.png</file>
-        <file>bright/combobox/core_dropdown_menu.png</file>
-        <file>bright/combobox/core_dropdown_menuup.png</file>
-        <file>bright/combobox/core_listitem_active.png</file>
-        <file>bright/lineedit/core_textinput_bg.png</file>
-        <file>bright/lineedit/core_textinput_bg_disabled.png</file>
-        <file>bright/lineedit/core_textinput_bg_highlight.png</file>
-        <file>bright/listitem/core_listitem_active.png</file>
-        <file>bright/listitem/core_listitem_divider.png</file>
-        <file>bright/progressbar/core_progressindicator_bg.png</file>
-        <file>bright/progressbar/core_progressindicator_complete.png</file>
-        <file>bright/progressbar/core_progressindicator_fill.png</file>
-        <file>bright/progressbar/core_progressindicator_vbg.png</file>
-        <file>bright/progressbar/core_progressindicator_vcomplete.png</file>
-        <file>bright/progressbar/core_progressindicator_vfill.png</file>
-        <file>bright/radiobutton/core_radiobutton_checked.png</file>
-        <file>bright/radiobutton/core_radiobutton_disabled.png</file>
-        <file>bright/radiobutton/core_radiobutton_disabled_checked.png</file>
-        <file>bright/radiobutton/core_radiobutton_inactive.png</file>
-        <file>bright/radiobutton/core_radiobutton_pressed.png</file>
-        <file>bright/scrollbar/core_scrollbar.png</file>
-        <file>bright/scrollbar/core_scrollbar_v.png</file>
-        <file>bright/slider/core_slider_active.png</file>
-        <file>bright/slider/core_slider_cache.png</file>
-        <file>bright/slider/core_slider_disabled.png</file>
-        <file>bright/slider/core_slider_enabled.png</file>
-        <file>bright/slider/core_slider_handle.png</file>
-        <file>bright/slider/core_slider_handle_disabled.png</file>
-        <file>bright/slider/core_slider_handle_pressed.png</file>
-        <file>bright/slider/core_slider_inactive.png</file>
-        <file>bright/slider/core_slider_vactive.png</file>
-        <file>bright/slider/core_slider_vcache.png</file>
-        <file>bright/slider/core_slider_vdisabled.png</file>
-        <file>bright/slider/core_slider_venabled.png</file>
-        <file>bright/slider/core_slider_vinactive.png</file>
-    </qresource>
-</RCC>
diff --git a/src/plugins/styles/bb10style/qbb10darkstyle.cpp b/src/plugins/styles/bb10style/qbb10darkstyle.cpp
deleted file mode 100644
index be2697510e..0000000000
--- a/src/plugins/styles/bb10style/qbb10darkstyle.cpp
+++ /dev/null
@@ -1,349 +0,0 @@
-/***************************************************************************
-**
-** Copyright (C) 2014 BlackBerry Limited. All rights reserved.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qbb10darkstyle.h"
-
-#include <QApplication>
-#include <QFont>
-#include <QStyleOption>
-#include <QProgressBar>
-#include <QComboBox>
-#include <QAbstractItemView>
-#include <QPainter>
-#include <QLineEdit>
-#include <QTextEdit>
-
-QT_BEGIN_NAMESPACE
-
-QBB10DarkStyle::QBB10DarkStyle() :
-    QPixmapStyle()
-{
-    addDescriptor(PB_Enabled,
-                  QLatin1String("://dark/button/core_button_inactive.png"),
-                  QMargins(13, 13, 13, 13),
-                  QTileRules(Qt::RepeatTile, Qt::StretchTile));
-    addDescriptor(PB_Checked,
-                  QLatin1String("://dark/button/core_button_enabled_selected.png"),
-                  QMargins(13, 13, 13, 13),
-                  QTileRules(Qt::RepeatTile, Qt::StretchTile));
-    addDescriptor(PB_Pressed,
-                  QLatin1String("://dark/button/core_button_pressed.png"),
-                  QMargins(13, 13, 13, 13),
-                  QTileRules(Qt::RepeatTile, Qt::StretchTile));
-    addDescriptor(PB_Disabled,
-                  QLatin1String("://dark/button/core_button_disabled.png"),
-                  QMargins(13, 13, 13, 13),
-                  QTileRules(Qt::RepeatTile, Qt::StretchTile));
-    addDescriptor(PB_PressedDisabled,
-                  QLatin1String("://dark/button/core_button_disabled_selected.png"),
-                  QMargins(13, 13, 13, 13),
-                  QTileRules(Qt::RepeatTile, Qt::StretchTile));
-
-    addDescriptor(LE_Enabled,
-                  QLatin1String("://dark/lineedit/core_textinput_bg.png"),
-                  QMargins(8, 8, 8, 8));
-    addDescriptor(LE_Disabled,
-                  QLatin1String("://dark/lineedit/core_textinput_bg_disabled.png"),
-                  QMargins(8, 8, 8, 8));
-    addDescriptor(LE_Focused,
-                  QLatin1String("://dark/lineedit/core_textinput_bg_highlight.png"),
-                  QMargins(8, 8, 8, 8));
-
-    copyDescriptor(LE_Enabled, TE_Enabled);
-    copyDescriptor(LE_Disabled, TE_Disabled);
-    copyDescriptor(LE_Focused, TE_Focused);
-
-    addPixmap(CB_Enabled,
-              QLatin1String("://dark/checkbox/core_checkbox_enabled.png"),
-              QMargins(16, 16, 16, 16));
-    addPixmap(CB_Checked,
-              QLatin1String("://dark/checkbox/core_checkbox_checked.png"),
-              QMargins(16, 16, 16, 16));
-    addPixmap(CB_Pressed,
-              QLatin1String("://dark/checkbox/core_checkbox_pressed.png"),
-              QMargins(16, 16, 16, 16));
-    addPixmap(CB_PressedChecked,
-              QLatin1String("://dark/checkbox/core_checkbox_pressed_checked.png"),
-              QMargins(16, 16, 16, 16));
-    addPixmap(CB_Disabled,
-              QLatin1String("://dark/checkbox/core_checkbox_disabled.png"),
-              QMargins(16, 16, 16, 16));
-    addPixmap(CB_DisabledChecked,
-              QLatin1String("://dark/checkbox/core_checkbox_disabled_checked.png"),
-              QMargins(16, 16, 16, 16));
-
-    addPixmap(RB_Enabled,
-              QLatin1String("://dark/radiobutton/core_radiobutton_inactive.png"),
-              QMargins(16, 16, 16, 16));
-    addPixmap(RB_Checked,
-              QLatin1String("://dark/radiobutton/core_radiobutton_checked.png"),
-              QMargins(16, 16, 16, 16));
-    addPixmap(RB_Pressed,
-              QLatin1String("://dark/radiobutton/core_radiobutton_pressed.png"),
-              QMargins(16, 16, 16, 16));
-    addPixmap(RB_Disabled,
-              QLatin1String("://dark/radiobutton/core_radiobutton_disabled.png"),
-              QMargins(16, 16, 16, 16));
-    addPixmap(RB_DisabledChecked,
-              QLatin1String("://dark/radiobutton/core_radiobutton_disabled_checked.png"),
-              QMargins(16, 16, 16, 16));
-
-    addDescriptor(PB_HBackground,
-                  QLatin1String("://dark/progressbar/core_progressindicator_bg.png"),
-                  QMargins(10, 10, 10, 10),
-                  QTileRules(Qt::RepeatTile, Qt::StretchTile));
-    addDescriptor(PB_HContent,
-                  QLatin1String("://dark/progressbar/core_progressindicator_fill.png"),
-                  QMargins(10, 10, 10, 10),
-                  QTileRules(Qt::RepeatTile, Qt::StretchTile));
-    addDescriptor(PB_HComplete,
-                  QLatin1String("://dark/progressbar/core_progressindicator_complete.png"),
-                  QMargins(10, 10, 10, 10),
-                  QTileRules(Qt::RepeatTile, Qt::StretchTile));
-    addDescriptor(PB_VBackground,
-                  QLatin1String("://dark/progressbar/core_progressindicator_vbg.png"),
-                  QMargins(10, 10, 10, 10),
-                  QTileRules(Qt::StretchTile, Qt::RepeatTile));
-    addDescriptor(PB_VContent,
-                  QLatin1String("://dark/progressbar/core_progressindicator_vfill.png"),
-                  QMargins(10, 10, 10, 10),
-                  QTileRules(Qt::StretchTile, Qt::RepeatTile));
-    addDescriptor(PB_VComplete,
-                  QLatin1String("://dark/progressbar/core_progressindicator_vcomplete.png"),
-                  QMargins(10, 10, 10, 10),
-                  QTileRules(Qt::StretchTile, Qt::RepeatTile));
-
-    addDescriptor(SG_HEnabled,
-                  QLatin1String("://dark/slider/core_slider_enabled.png"),
-                  QMargins(50, 50, 50, 50),
-                  QTileRules(Qt::RepeatTile, Qt::StretchTile));
-    addDescriptor(SG_HDisabled,
-                  QLatin1String("://dark/slider/core_slider_disabled.png"),
-                  QMargins(50, 50, 50, 50),
-                  QTileRules(Qt::RepeatTile, Qt::StretchTile));
-    addDescriptor(SG_HActiveEnabled,
-                  QLatin1String("://dark/slider/core_slider_inactive.png"),
-                  QMargins(50, 50, 50, 50),
-                  QTileRules(Qt::RepeatTile, Qt::StretchTile));
-    addDescriptor(SG_HActivePressed,
-                  QLatin1String("://dark/slider/core_slider_active.png"),
-                  QMargins(50, 50, 50, 50),
-                  QTileRules(Qt::RepeatTile, Qt::StretchTile));
-    addDescriptor(SG_HActiveDisabled,
-                  QLatin1String("://dark/slider/core_slider_cache.png"),
-                  QMargins(50, 50, 50, 50),
-                  QTileRules(Qt::RepeatTile, Qt::StretchTile));
-    addDescriptor(SG_VEnabled,
-                  QLatin1String("://dark/slider/core_slider_venabled.png"),
-                  QMargins(50, 50, 50, 50),
-                  QTileRules(Qt::StretchTile, Qt::RepeatTile));
-    addDescriptor(SG_VDisabled,
-                  QLatin1String("://dark/slider/core_slider_vdisabled.png"),
-                  QMargins(50, 50, 50, 50),
-                  QTileRules(Qt::StretchTile, Qt::RepeatTile));
-    addDescriptor(SG_VActiveEnabled,
-                  QLatin1String("://dark/slider/core_slider_vinactive.png"),
-                  QMargins(50, 50, 50, 50),
-                  QTileRules(Qt::StretchTile, Qt::RepeatTile));
-    addDescriptor(SG_VActivePressed,
-                  QLatin1String("://dark/slider/core_slider_vactive.png"),
-                  QMargins(50, 50, 50, 50),
-                  QTileRules(Qt::StretchTile, Qt::RepeatTile));
-    addDescriptor(SG_VActiveDisabled,
-                  QLatin1String("://dark/slider/core_slider_vcache.png"),
-                  QMargins(50, 50, 50, 50),
-                  QTileRules(Qt::StretchTile, Qt::RepeatTile));
-
-    addPixmap(SH_HEnabled,
-                  QLatin1String("://dark/slider/core_slider_handle.png"));
-    addPixmap(SH_HDisabled,
-                  QLatin1String("://dark/slider/core_slider_handle_disabled.png"));
-    addPixmap(SH_HPressed,
-                  QLatin1String("://dark/slider/core_slider_handle_pressed.png"));
-    addPixmap(SH_VEnabled,
-                  QLatin1String("://dark/slider/core_slider_handle.png"));
-    addPixmap(SH_VDisabled,
-                  QLatin1String("://dark/slider/core_slider_handle_disabled.png"));
-    addPixmap(SH_VPressed,
-                  QLatin1String("://dark/slider/core_slider_handle_pressed.png"));
-
-    addDescriptor(DD_ButtonEnabled,
-                  QLatin1String("://dark/combobox/core_dropdown_button.png"),
-                  QMargins(14, 14, 14, 14),
-                  QTileRules(Qt::RepeatTile, Qt::StretchTile));
-    addDescriptor(DD_ButtonDisabled,
-                  QLatin1String("://dark/combobox/core_dropdown_button_disabled.png"),
-                  QMargins(14, 14, 14, 14),
-                  QTileRules(Qt::RepeatTile, Qt::StretchTile));
-    addDescriptor(DD_ButtonPressed,
-                  QLatin1String("://dark/combobox/core_dropdown_button_pressed.png"),
-                  QMargins(14, 14, 14, 14),
-                  QTileRules(Qt::RepeatTile, Qt::StretchTile));
-    addDescriptor(DD_ItemSelected,
-                  QLatin1String("://dark/combobox/core_listitem_active.png"));
-    addPixmap(DD_ArrowEnabled,
-                  QLatin1String("://dark/combobox/core_dropdown_button_arrowdown.png"),
-                  QMargins(35, 39, 35, 39));
-    copyPixmap(DD_ArrowEnabled, DD_ArrowDisabled);
-    addPixmap(DD_ArrowPressed,
-                  QLatin1String("://dark/combobox/core_dropdown_button_arrowdown_pressed.png"),
-                  QMargins(35, 39, 35, 39));
-    addPixmap(DD_ArrowOpen,
-                  QLatin1String("://dark/combobox/core_dropdown_button_arrowup.png"),
-                  QMargins(35, 39, 35, 39));
-    addDescriptor(DD_PopupDown,
-                  QLatin1String("://dark/combobox/core_dropdown_menu.png"),
-                  QMargins(12, 12, 12, 12), QTileRules(Qt::StretchTile, Qt::StretchTile));
-    addDescriptor(DD_PopupUp,
-                  QLatin1String("://dark/combobox/core_dropdown_menuup.png"),
-                  QMargins(12, 12, 12, 12), QTileRules(Qt::StretchTile, Qt::StretchTile));
-    addPixmap(DD_ItemSeparator,
-                  QLatin1String("://dark/combobox/core_dropdown_divider.png"),
-                  QMargins(5, 0, 5, 0));
-
-    addDescriptor(ID_Selected,
-                  QLatin1String("://dark/listitem/core_listitem_active.png"));
-    addPixmap(ID_Separator,
-                  QLatin1String("://dark/listitem/core_listitem_divider.png"));
-
-    addDescriptor(SB_Horizontal,
-                  QLatin1String("://dark/scrollbar/core_scrollbar.png"),
-                  QMargins(7, 8, 7, 8),
-                  QTileRules(Qt::RepeatTile, Qt::StretchTile));
-    addDescriptor(SB_Vertical,
-                  QLatin1String("://dark/scrollbar/core_scrollbar_v.png"),
-                  QMargins(8, 7, 8, 7),
-                  QTileRules(Qt::StretchTile, Qt::RepeatTile));
-}
-
-QBB10DarkStyle::~QBB10DarkStyle()
-{
-}
-
-void QBB10DarkStyle::polish(QApplication *application)
-{
-    QPixmapStyle::polish(application);
-}
-
-void QBB10DarkStyle::polish(QWidget *widget)
-{
-    // Hide the text by default
-    if (QProgressBar *pb = qobject_cast<QProgressBar*>(widget))
-        pb->setTextVisible(false);
-
-    if (QComboBox *cb = qobject_cast<QComboBox*>(widget)) {
-        QAbstractItemView *list = cb->view();
-        QPalette p = list->palette();
-        p.setBrush(QPalette::HighlightedText, p.brush(QPalette::Text));
-        list->setPalette(p);
-    }
-
-    if (qobject_cast<QLineEdit*>(widget) || qobject_cast<QTextEdit*>(widget)) {
-        QPalette p = widget->palette();
-        p.setBrush(QPalette::Text, QColor(38, 38, 38));
-        widget->setPalette(p);
-    }
-
-    if (qobject_cast<QAbstractItemView*>(widget)) {
-        QPalette p = widget->palette();
-        p.setBrush(QPalette::Disabled, QPalette::HighlightedText, p.brush(QPalette::Text));
-        widget->setPalette(p);
-    }
-
-    QPixmapStyle::polish(widget);
-}
-
-QPalette QBB10DarkStyle::standardPalette() const
-{
-    QPalette p;
-
-    QColor color = QColor(250, 250, 250);
-    p.setBrush(QPalette::ButtonText, color);
-    p.setBrush(QPalette::WindowText, color);
-    p.setBrush(QPalette::Text, color);
-
-    color.setAlpha(179);
-    p.setBrush(QPalette::Disabled, QPalette::ButtonText, color);
-    p.setBrush(QPalette::Disabled, QPalette::WindowText, color);
-    p.setBrush(QPalette::Disabled, QPalette::Text, color);
-
-    p.setColor(QPalette::Window, QColor(18, 18, 18));
-
-    p.setBrush(QPalette::Highlight, QColor(0, 168, 223));
-    p.setBrush(QPalette::HighlightedText, QColor(250, 250,250));
-
-    return p;
-}
-
-void QBB10DarkStyle::drawControl(QStyle::ControlElement element, const QStyleOption *option,
-                                  QPainter *painter, const QWidget *widget) const
-{
-    switch (element) {
-    case CE_PushButtonLabel:
-    {
-        const bool on = option->state & State_On || option->state & State_Sunken;
-        const QStyleOptionButton *button = qstyleoption_cast<const QStyleOptionButton*>(option);
-        QStyleOptionButton newOpt = *button;
-        if (on)
-            newOpt.palette.setBrush(QPalette::ButtonText, QColor(38, 38, 38));
-        QPixmapStyle::drawControl(CE_PushButtonLabel, &newOpt, painter, widget);
-        break;
-    }
-    case CE_ProgressBarLabel:
-        // Don't draw the progress bar label
-        break;
-    default:
-        QPixmapStyle::drawControl(element, option, painter, widget);
-    }
-}
-
-void QBB10DarkStyle::drawPrimitive(QStyle::PrimitiveElement element, const QStyleOption *option,
-                                    QPainter *painter, const QWidget *widget) const
-{
-    QPixmapStyle::drawPrimitive(element, option, painter, widget);
-
-    if (element == PE_PanelItemViewItem) {
-        // Draw the checkbox for current item
-        if (widget->property("_pixmap_combobox_list").toBool()
-                && option->state & QStyle::State_Selected) {
-            QPixmap pix(QLatin1String("://dark/combobox/core_dropdown_checkmark.png"));
-            QRect rect = option->rect;
-            const int margin = rect.height() / 2;
-            QPoint pos(rect.right() - margin - pix.width() / 2,
-                       rect.top() + margin - pix.height() / 2);
-            painter->drawPixmap(pos, pix);
-        }
-    }
-}
-
-QT_END_NAMESPACE
diff --git a/src/plugins/styles/bb10style/qbb10darkstyle.h b/src/plugins/styles/bb10style/qbb10darkstyle.h
deleted file mode 100644
index df04ea70b5..0000000000
--- a/src/plugins/styles/bb10style/qbb10darkstyle.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/***************************************************************************
-**
-** Copyright (C) 2014 BlackBerry Limited. All rights reserved.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QBB10DARKSTYLE_H
-#define QBB10DARKSTYLE_H
-
-#include <QPixmapStyle>
-
-QT_BEGIN_NAMESPACE
-
-class QBB10DarkStyle : public QPixmapStyle
-{
-    Q_OBJECT
-
-public:
-    QBB10DarkStyle();
-    ~QBB10DarkStyle();
-
-    void polish(QApplication *application);
-    void polish(QWidget *widget);
-
-    QPalette standardPalette() const;
-
-    void drawControl(ControlElement element, const QStyleOption *option,
-            QPainter *painter, const QWidget *widget = 0) const;
-    void drawPrimitive(PrimitiveElement element, const QStyleOption *option,
-                       QPainter *painter, const QWidget *widget) const;
-};
-
-QT_END_NAMESPACE
-
-#endif // QBB10DARKSTYLE_H
diff --git a/src/plugins/styles/bb10style/qbb10darkstyle.qrc b/src/plugins/styles/bb10style/qbb10darkstyle.qrc
deleted file mode 100644
index 31a5236207..0000000000
--- a/src/plugins/styles/bb10style/qbb10darkstyle.qrc
+++ /dev/null
@@ -1,57 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file>dark/button/core_button_disabled.png</file>
-        <file>dark/button/core_button_disabled_selected.png</file>
-        <file>dark/button/core_button_inactive.png</file>
-        <file>dark/button/core_button_enabled_selected.png</file>
-        <file>dark/button/core_button_pressed.png</file>
-        <file>dark/checkbox/core_checkbox_checked.png</file>
-        <file>dark/checkbox/core_checkbox_disabled.png</file>
-        <file>dark/checkbox/core_checkbox_disabled_checked.png</file>
-        <file>dark/checkbox/core_checkbox_enabled.png</file>
-        <file>dark/checkbox/core_checkbox_pressed.png</file>
-        <file>dark/checkbox/core_checkbox_pressed_checked.png</file>
-        <file>dark/combobox/core_dropdown_button.png</file>
-        <file>dark/combobox/core_dropdown_button_arrowdown.png</file>
-        <file>dark/combobox/core_dropdown_button_arrowdown_pressed.png</file>
-        <file>dark/combobox/core_dropdown_button_arrowup.png</file>
-        <file>dark/combobox/core_dropdown_button_disabled.png</file>
-        <file>dark/combobox/core_dropdown_button_pressed.png</file>
-        <file>dark/combobox/core_dropdown_checkmark.png</file>
-        <file>dark/combobox/core_dropdown_divider.png</file>
-        <file>dark/combobox/core_dropdown_menu.png</file>
-        <file>dark/combobox/core_dropdown_menuup.png</file>
-        <file>dark/combobox/core_listitem_active.png</file>
-        <file>dark/lineedit/core_textinput_bg.png</file>
-        <file>dark/lineedit/core_textinput_bg_disabled.png</file>
-        <file>dark/lineedit/core_textinput_bg_highlight.png</file>
-        <file>dark/listitem/core_listitem_active.png</file>
-        <file>dark/listitem/core_listitem_divider.png</file>
-        <file>dark/progressbar/core_progressindicator_bg.png</file>
-        <file>dark/progressbar/core_progressindicator_complete.png</file>
-        <file>dark/progressbar/core_progressindicator_fill.png</file>
-        <file>dark/progressbar/core_progressindicator_vbg.png</file>
-        <file>dark/progressbar/core_progressindicator_vcomplete.png</file>
-        <file>dark/progressbar/core_progressindicator_vfill.png</file>
-        <file>dark/radiobutton/core_radiobutton_checked.png</file>
-        <file>dark/radiobutton/core_radiobutton_disabled.png</file>
-        <file>dark/radiobutton/core_radiobutton_disabled_checked.png</file>
-        <file>dark/radiobutton/core_radiobutton_inactive.png</file>
-        <file>dark/radiobutton/core_radiobutton_pressed.png</file>
-        <file>dark/scrollbar/core_scrollbar.png</file>
-        <file>dark/scrollbar/core_scrollbar_v.png</file>
-        <file>dark/slider/core_slider_active.png</file>
-        <file>dark/slider/core_slider_cache.png</file>
-        <file>dark/slider/core_slider_disabled.png</file>
-        <file>dark/slider/core_slider_enabled.png</file>
-        <file>dark/slider/core_slider_handle.png</file>
-        <file>dark/slider/core_slider_handle_disabled.png</file>
-        <file>dark/slider/core_slider_handle_pressed.png</file>
-        <file>dark/slider/core_slider_inactive.png</file>
-        <file>dark/slider/core_slider_vactive.png</file>
-        <file>dark/slider/core_slider_vcache.png</file>
-        <file>dark/slider/core_slider_vdisabled.png</file>
-        <file>dark/slider/core_slider_venabled.png</file>
-        <file>dark/slider/core_slider_vinactive.png</file>
-    </qresource>
-</RCC>
diff --git a/src/plugins/styles/bb10style/qbb10styleplugin.cpp b/src/plugins/styles/bb10style/qbb10styleplugin.cpp
deleted file mode 100644
index 98607f174a..0000000000
--- a/src/plugins/styles/bb10style/qbb10styleplugin.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/***************************************************************************
-**
-** Copyright (C) 2014 BlackBerry Limited. All rights reserved.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qbb10styleplugin.h"
-#include "qbb10darkstyle.h"
-#include "qbb10brightstyle.h"
-
-QT_BEGIN_NAMESPACE
-
-QBB10StylePlugin::QBB10StylePlugin()
-{
-}
-
-QBB10StylePlugin::~QBB10StylePlugin()
-{
-}
-
-QStyle *QBB10StylePlugin::create(const QString &key)
-{
-    const QString keyLower(key.toLower());
-    if (keyLower == QLatin1String("bb10bright"))
-        return new QBB10BrightStyle;
-    else if (keyLower == QLatin1String("bb10dark"))
-        return new QBB10DarkStyle;
-
-    return 0;
-}
-
-QStringList QBB10StylePlugin::keys() const
-{
-    return QStringList() << QLatin1String("bb10bright") << QLatin1String("bb10dark");
-}
-
-QT_END_NAMESPACE
-
-#include "moc_qbb10styleplugin.cpp"
diff --git a/src/plugins/styles/bb10style/qbb10styleplugin.h b/src/plugins/styles/bb10style/qbb10styleplugin.h
deleted file mode 100644
index 8058e4859e..0000000000
--- a/src/plugins/styles/bb10style/qbb10styleplugin.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/***************************************************************************
-**
-** Copyright (C) 2014 BlackBerry Limited. All rights reserved.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QBB10STYLEPLUGIN_H
-#define QBB10STYLEPLUGIN_H
-
-#include <QStylePlugin>
-
-QT_BEGIN_NAMESPACE
-
-class QBB10StylePlugin : public QStylePlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QStyleFactoryInterface" FILE "qbb10styleplugin.json")
-
-public:
-    QBB10StylePlugin();
-    ~QBB10StylePlugin();
-
-    QStyle *create(const QString &key);
-    QStringList keys() const;
-};
-
-QT_END_NAMESPACE
-
-#endif // QBB10STYLEPLUGIN_H
diff --git a/src/plugins/styles/bb10style/qbb10styleplugin.json b/src/plugins/styles/bb10style/qbb10styleplugin.json
deleted file mode 100644
index 8f79b706c3..0000000000
--- a/src/plugins/styles/bb10style/qbb10styleplugin.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "Keys": [ "bb10bright", "bb10dark" ]
-}
diff --git a/src/plugins/styles/styles.pro b/src/plugins/styles/styles.pro
deleted file mode 100644
index 88b3f90e0c..0000000000
--- a/src/plugins/styles/styles.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-TEMPLATE = subdirs
-
-blackberry:SUBDIRS += bb10style