15 files changed, 0 insertions, 1299 deletions
diff --git a/src/plugins/bearer/android/CMakeLists.txt b/src/plugins/bearer/android/CMakeLists.txt
deleted file mode 100644
index 193cbf1fe3..0000000000
--- a/src/plugins/bearer/android/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-# Generated from android.pro.
-
-add_subdirectory(src)
-add_subdirectory(jar)
diff --git a/src/plugins/bearer/android/android.pro b/src/plugins/bearer/android/android.pro
deleted file mode 100644
index 6a51abf5d7..0000000000
--- a/src/plugins/bearer/android/android.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-TEMPLATE = subdirs
-
-SUBDIRS += src \
-           jar
diff --git a/src/plugins/bearer/android/jar/.prev_CMakeLists.txt b/src/plugins/bearer/android/jar/.prev_CMakeLists.txt
deleted file mode 100644
index f5f25c4f8b..0000000000
--- a/src/plugins/bearer/android/jar/.prev_CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-# Generated from jar.pro.
-
-set(java_sources
-    src/org/qtproject/qt5/android/bearer/QtNetworkReceiver.java
-)
-
-add_jar(QtAndroidBearer
-    INCLUDE_JARS ${QT_ANDROID_JAR}
-    SOURCES ${java_sources}
-)
-
-install_jar(QtAndroidBearer
-    DESTINATION jar
-    COMPONENT Devel
-)
-
diff --git a/src/plugins/bearer/android/jar/CMakeLists.txt b/src/plugins/bearer/android/jar/CMakeLists.txt
deleted file mode 100644
index 16641d42b7..0000000000
--- a/src/plugins/bearer/android/jar/CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-#####################################################################
-## QtAndroidBearer Binary:
-#####################################################################
-
-set(java_sources
-    src/org/qtproject/qt5/android/bearer/QtNetworkReceiver.java
-)
-
-add_jar(QtAndroidBearer
-    INCLUDE_JARS ${QT_ANDROID_JAR}
-    SOURCES ${java_sources}
-    )
-
-install_jar(QtAndroidBearer
-    DESTINATION jar
-    COMPONENT Devel)
-
-#### Keys ignored in scope 1:.:.:jar.pro:<TRUE>:
-# JAVACLASSPATH = "$$PWD/src"
-# JAVASOURCES = "$$PWD/src/org/qtproject/qt5/android/bearer/QtNetworkReceiver.java"
-# _LOADED = "qt_build_paths"
-
diff --git a/src/plugins/bearer/android/jar/jar.pro b/src/plugins/bearer/android/jar/jar.pro
deleted file mode 100644
index 8277a8abc1..0000000000
--- a/src/plugins/bearer/android/jar/jar.pro
+++ /dev/null
@@ -1,15 +0,0 @@
-CONFIG += single_arch
-
-TARGET = QtAndroidBearer
-
-load(qt_build_paths)
-CONFIG += java
-DESTDIR = $$MODULE_BASE_OUTDIR/jar
-
-JAVACLASSPATH += $$PWD/src
-
-JAVASOURCES += $$PWD/src/org/qtproject/qt5/android/bearer/QtNetworkReceiver.java
-
-# install
-target.path = $$[QT_INSTALL_PREFIX]/jar
-INSTALLS += target
diff --git a/src/plugins/bearer/android/jar/src/org/qtproject/qt5/android/bearer/QtNetworkReceiver.java b/src/plugins/bearer/android/jar/src/org/qtproject/qt5/android/bearer/QtNetworkReceiver.java
deleted file mode 100644
index 805c90548b..0000000000
--- a/src/plugins/bearer/android/jar/src/org/qtproject/qt5/android/bearer/QtNetworkReceiver.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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 https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://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 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-package org.qtproject.qt5.android.bearer;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.util.Log;
-import android.net.ConnectivityManager;
-
-public class QtNetworkReceiver
-{
-    private static final String LOG_TAG = "QtNetworkReceiver";
-    private static native void activeNetworkInfoChanged();
-    private static BroadcastReceiverPrivate m_broadcastReceiver = null;
-    private static final Object m_lock = new Object();
-
-    private static class BroadcastReceiverPrivate extends BroadcastReceiver
-    {
-        @Override
-        public void onReceive(Context context, Intent intent)
-        {
-            activeNetworkInfoChanged();
-        }
-    }
-
-    private QtNetworkReceiver() {}
-
-    public static void registerReceiver(final Context context)
-    {
-        synchronized (m_lock) {
-            if (m_broadcastReceiver == null) {
-                m_broadcastReceiver = new BroadcastReceiverPrivate();
-                IntentFilter intentFilter = new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION);
-                context.registerReceiver(m_broadcastReceiver, intentFilter);
-            }
-        }
-    }
-
-    public static void unregisterReceiver(final Context context)
-    {
-        synchronized (m_lock) {
-            if (m_broadcastReceiver == null)
-                return;
-
-            context.unregisterReceiver(m_broadcastReceiver);
-        }
-    }
-
-    public static ConnectivityManager getConnectivityManager(final Context context)
-    {
-        return (ConnectivityManager)context.getSystemService(Context.CONNECTIVITY_SERVICE);
-    }
-}
diff --git a/src/plugins/bearer/android/src/CMakeLists.txt b/src/plugins/bearer/android/src/CMakeLists.txt
deleted file mode 100644
index 5be89e316b..0000000000
--- a/src/plugins/bearer/android/src/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-# Generated from src.pro.
-
-#####################################################################
-## QAndroidBearerEnginePlugin Plugin:
-#####################################################################
-
-qt_add_plugin(QAndroidBearerEnginePlugin
-    OUTPUT_NAME qandroidbearer
-    TYPE bearer
-    SOURCES
-        main.cpp
-        qandroidbearerengine.cpp qandroidbearerengine.h
-        wrappers/androidconnectivitymanager.cpp wrappers/androidconnectivitymanager.h
-    INCLUDE_DIRECTORIES
-        wrappers
-    PUBLIC_LIBRARIES
-        Qt::CorePrivate
-        Qt::NetworkPrivate
-)
diff --git a/src/plugins/bearer/android/src/android.json b/src/plugins/bearer/android/src/android.json
deleted file mode 100644
index 6843bd3301..0000000000
--- a/src/plugins/bearer/android/src/android.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "Keys": [ "android" ]
-}
diff --git a/src/plugins/bearer/android/src/main.cpp b/src/plugins/bearer/android/src/main.cpp
deleted file mode 100644
index f3a5074e5d..0000000000
--- a/src/plugins/bearer/android/src/main.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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 https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://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 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qandroidbearerengine.h"
-#include <QtNetwork/private/qbearerplugin_p.h>
-
-#ifndef QT_NO_BEARERMANAGEMENT
-
-QT_BEGIN_NAMESPACE
-
-class QAndroidBearerEnginePlugin : public QBearerEnginePlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QBearerEngineFactoryInterface" FILE "android.json")
-
-public:
-    QBearerEngine *create(const QString &key) const override
-    {
-        return (key == QLatin1String("android")) ? new QAndroidBearerEngine() : 0;
-    }
-};
-
-QT_END_NAMESPACE
-
-#include "main.moc"
-
-#endif // QT_NO_BEARERMANAGEMENT
diff --git a/src/plugins/bearer/android/src/qandroidbearerengine.cpp b/src/plugins/bearer/android/src/qandroidbearerengine.cpp
deleted file mode 100644
index ad9895e0cf..0000000000
--- a/src/plugins/bearer/android/src/qandroidbearerengine.cpp
+++ /dev/null
@@ -1,391 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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 https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://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 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qandroidbearerengine.h"
-#include <private/qnetworksession_impl_p.h>
-#include "wrappers/androidconnectivitymanager.h"
-
-#ifndef QT_NO_BEARERMANAGEMENT
-
-QT_BEGIN_NAMESPACE
-
-static QString networkConfType(const AndroidNetworkInfo &networkInfo)
-{
-    switch (networkInfo.getType()) {
-    case AndroidNetworkInfo::Mobile:
-        return QStringLiteral("Mobile");
-    case AndroidNetworkInfo::Wifi:
-        return QStringLiteral("WiFi");
-    case AndroidNetworkInfo::Wimax:
-        return QStringLiteral("WiMax");
-    case AndroidNetworkInfo::Ethernet:
-        return QStringLiteral("Ethernet");
-    case AndroidNetworkInfo::Bluetooth:
-        return QStringLiteral("Bluetooth");
-    default:
-        break;
-    }
-
-    return QString();
-}
-
-static inline bool isMobile(QNetworkConfiguration::BearerType type)
-{
-    if (type == QNetworkConfiguration::BearerWLAN
-        || type == QNetworkConfiguration::BearerWiMAX
-        || type == QNetworkConfiguration::BearerBluetooth
-        || type == QNetworkConfiguration::BearerEthernet
-        || type == QNetworkConfiguration::BearerUnknown) {
-        return false;
-    }
-
-    return true;
-}
-
-static QNetworkConfiguration::BearerType getBearerType(const AndroidNetworkInfo &networkInfo)
-{
-    switch (networkInfo.getType()) {
-    case AndroidNetworkInfo::Mobile:
-    {
-        switch (networkInfo.getSubtype()) {
-        case AndroidNetworkInfo::Gprs:
-        case AndroidNetworkInfo::Edge:
-        case AndroidNetworkInfo::Iden:    // 2G
-            return QNetworkConfiguration::Bearer2G;
-        case AndroidNetworkInfo::Umts:    // BearerWCDMA (3 .5 .75 G)
-        case AndroidNetworkInfo::Hsdpa:   // 3G (?) UMTS
-        case AndroidNetworkInfo::Hsupa:   // 3G (?) UMTS
-            return QNetworkConfiguration::BearerWCDMA;
-        case AndroidNetworkInfo::Cdma:    // CDMA ISA95[AB]
-        case AndroidNetworkInfo::Cdma1xRTT:   // BearerCDMA2000 (3G)
-        case AndroidNetworkInfo::Ehrpd:   // CDMA Bridge thing?!?
-            return QNetworkConfiguration::BearerCDMA2000;
-        case AndroidNetworkInfo::Evdo0:   // BearerEVDO
-        case AndroidNetworkInfo::EvdoA:   // BearerEVDO
-        case AndroidNetworkInfo::EvdoB:   // BearerEVDO
-            return QNetworkConfiguration::BearerEVDO;
-        case AndroidNetworkInfo::Hspa:
-        case AndroidNetworkInfo::Hspap:   // HSPA+
-            return QNetworkConfiguration::BearerHSPA;
-        case AndroidNetworkInfo::Lte:     // BearerLTE (4G)
-            return QNetworkConfiguration::BearerLTE;
-        default:
-            break;
-        }
-    }
-    case AndroidNetworkInfo::Wifi:
-        return QNetworkConfiguration::BearerWLAN;
-    case AndroidNetworkInfo::Wimax:
-        return QNetworkConfiguration::BearerWiMAX;
-    case AndroidNetworkInfo::Bluetooth:
-    case AndroidNetworkInfo::MobileDun:
-        return QNetworkConfiguration::BearerBluetooth;
-    case AndroidNetworkInfo::Ethernet:
-        return QNetworkConfiguration::BearerEthernet;
-    case AndroidNetworkInfo::MobileMms:
-    case AndroidNetworkInfo::MobileSupl:
-    case AndroidNetworkInfo::MobileHipri:
-    case AndroidNetworkInfo::Dummy:
-    case AndroidNetworkInfo::UnknownType:
-        break;
-    }
-
-    return QNetworkConfiguration::BearerUnknown;
-}
-
-QAndroidBearerEngine::QAndroidBearerEngine(QObject *parent)
-    : QBearerEngineImpl(parent),
-      m_connectivityManager(0)
-{
-}
-
-QAndroidBearerEngine::~QAndroidBearerEngine()
-{
-}
-
-QString QAndroidBearerEngine::getInterfaceFromId(const QString &id)
-{
-    const QMutexLocker locker(&mutex);
-    return m_configurationInterface.value(id);
-}
-
-bool QAndroidBearerEngine::hasIdentifier(const QString &id)
-{
-    const QMutexLocker locker(&mutex);
-    return m_configurationInterface.contains(id);
-}
-
-void QAndroidBearerEngine::connectToId(const QString &id)
-{
-    Q_EMIT connectionError(id, OperationNotSupported);
-}
-
-void QAndroidBearerEngine::disconnectFromId(const QString &id)
-{
-    Q_EMIT connectionError(id, OperationNotSupported);
-}
-
-QNetworkSession::State QAndroidBearerEngine::sessionStateForId(const QString &id)
-{
-    const QMutexLocker locker(&mutex);
-    QNetworkConfigurationPrivatePointer ptr = accessPointConfigurations.value(id);
-
-    if ((!ptr || !ptr->isValid) || m_connectivityManager == 0)
-        return QNetworkSession::Invalid;
-
-    const QMutexLocker configLocker(&ptr->mutex);
-    // Don't re-order...
-    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 QAndroidBearerEngine::capabilities() const
-{
-
-    return AndroidTrafficStats::isTrafficStatsSupported()
-            ? QNetworkConfigurationManager::ForcedRoaming
-              | QNetworkConfigurationManager::DataStatistics
-            : QNetworkConfigurationManager::ForcedRoaming;
-
-}
-
-QNetworkSessionPrivate *QAndroidBearerEngine::createSessionBackend()
-{
-    return new QNetworkSessionPrivateImpl();
-}
-
-QNetworkConfigurationPrivatePointer QAndroidBearerEngine::defaultConfiguration()
-{
-    return QNetworkConfigurationPrivatePointer();
-}
-
-bool QAndroidBearerEngine::requiresPolling() const
-{
-    return false;
-}
-
-quint64 QAndroidBearerEngine::bytesWritten(const QString &id)
-{
-    QMutexLocker lock(&mutex);
-    QNetworkConfigurationPrivatePointer ptr = accessPointConfigurations.value(id);
-    if (!ptr || !ptr->isValid)
-        return 0;
-
-    return isMobile(ptr->bearerType)
-            ? AndroidTrafficStats::getMobileTxBytes()
-            : AndroidTrafficStats::getTotalTxBytes() - AndroidTrafficStats::getMobileTxBytes();
-}
-
-quint64 QAndroidBearerEngine::bytesReceived(const QString &id)
-{
-    QMutexLocker lock(&mutex);
-    QNetworkConfigurationPrivatePointer ptr = accessPointConfigurations.value(id);
-    if (!ptr || !ptr->isValid)
-        return 0;
-
-    return isMobile(ptr->bearerType)
-            ? AndroidTrafficStats::getMobileRxBytes()
-            : AndroidTrafficStats::getTotalRxBytes() - AndroidTrafficStats::getMobileRxBytes();
-}
-
-quint64 QAndroidBearerEngine::startTime(const QString &id)
-{
-    Q_UNUSED(id);
-    return Q_UINT64_C(0);
-}
-
-void QAndroidBearerEngine::initialize()
-{
-    if (m_connectivityManager != 0)
-        return;
-
-    m_connectivityManager = AndroidConnectivityManager::getInstance();
-    if (m_connectivityManager == 0)
-        return;
-
-    updateConfigurations();
-
-    connect(m_connectivityManager, &AndroidConnectivityManager::activeNetworkChanged,
-            this, &QAndroidBearerEngine::updateConfigurations);
-
-}
-
-void QAndroidBearerEngine::requestUpdate()
-{
-    updateConfigurations();
-}
-
-void QAndroidBearerEngine::updateConfigurations()
-{
-#ifndef QT_NO_NETWORKINTERFACE
-    if (m_connectivityManager == 0)
-        return;
-
-    {
-        QMutexLocker locker(&mutex);
-        QStringList oldKeys = accessPointConfigurations.keys();
-
-        QList<QNetworkInterface> interfaces = QNetworkInterface::allInterfaces();
-        if (interfaces.isEmpty())
-            interfaces = QNetworkInterface::allInterfaces();
-
-        // Create a configuration for each of the main types (WiFi, Mobile, Bluetooth, WiMax, Ethernet)
-        const auto netInfos = m_connectivityManager->getAllNetworkInfo();
-        for (const AndroidNetworkInfo &netInfo : netInfos) {
-
-            if (!netInfo.isValid())
-                continue;
-
-            const QString name = networkConfType(netInfo);
-            if (name.isEmpty())
-                continue;
-
-            QNetworkConfiguration::BearerType bearerType = getBearerType(netInfo);
-
-            QString interfaceName;
-            QNetworkConfiguration::StateFlag state = QNetworkConfiguration::Defined;
-            if (netInfo.isAvailable()) {
-                if (netInfo.isConnected()) {
-                    // Attempt to map an interface to this configuration
-                    while (!interfaces.isEmpty()) {
-                        QNetworkInterface interface = interfaces.takeFirst();
-                        // ignore loopback interface
-                        if (!interface.isValid())
-                            continue;
-
-                        if (interface.flags() & QNetworkInterface::IsLoopBack)
-                            continue;
-                        // There is no way to get the interface from the NetworkInfo, so
-                        // look for an active interface...
-                        if (interface.flags() & QNetworkInterface::IsRunning
-                                && !interface.addressEntries().isEmpty()) {
-                            state = QNetworkConfiguration::Active;
-                            interfaceName = interface.name();
-                            break;
-                        }
-                    }
-                }
-            }
-
-            const QString key = QString(QLatin1String("android:%1:%2")).arg(name).arg(interfaceName);
-            const QString id = QString::number(qHash(key));
-            m_configurationInterface[id] = interfaceName;
-
-            oldKeys.removeAll(id);
-            if (accessPointConfigurations.contains(id)) {
-                QNetworkConfigurationPrivatePointer ptr = accessPointConfigurations.value(id);
-                bool changed = false;
-                {
-                    const QMutexLocker confLocker(&ptr->mutex);
-
-                    if (!ptr->isValid) {
-                        ptr->isValid = true;
-                        changed = true;
-                    }
-
-                    // Don't reset the bearer type to 'Unknown'
-                    if (ptr->bearerType != QNetworkConfiguration::BearerUnknown
-                            && ptr->bearerType != bearerType) {
-                        ptr->bearerType = bearerType;
-                        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;
-                    }
-                } // Unlock configuration
-
-                if (changed) {
-                    locker.unlock();
-                    Q_EMIT configurationChanged(ptr);
-                    locker.relock();
-                }
-            } else {
-                QNetworkConfigurationPrivatePointer ptr(new QNetworkConfigurationPrivate);
-                ptr->name = name;
-                ptr->isValid = true;
-                ptr->id = id;
-                ptr->state = state;
-                ptr->type = QNetworkConfiguration::InternetAccessPoint;
-                ptr->bearerType = bearerType;
-                accessPointConfigurations.insert(id, ptr);
-                locker.unlock();
-                Q_EMIT configurationAdded(ptr);
-                locker.relock();
-            }
-        }
-
-        while (!oldKeys.isEmpty()) {
-            QNetworkConfigurationPrivatePointer ptr = accessPointConfigurations.take(oldKeys.takeFirst());
-            m_configurationInterface.remove(ptr->id);
-            locker.unlock();
-            Q_EMIT configurationRemoved(ptr);
-            locker.relock();
-        }
-
-    } // Unlock engine
-
-#endif // QT_NO_NETWORKINTERFACE
-
-    Q_EMIT updateCompleted();
-}
-
-QT_END_NAMESPACE
-
-#endif // QT_NO_BEARERMANAGEMENT
diff --git a/src/plugins/bearer/android/src/qandroidbearerengine.h b/src/plugins/bearer/android/src/qandroidbearerengine.h
deleted file mode 100644
index 867d04d886..0000000000
--- a/src/plugins/bearer/android/src/qandroidbearerengine.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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 https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://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 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QANDROIDBEARERENGINE_H
-#define QANDROIDBEARERENGINE_H
-
-#include <private/qbearerengine_impl_p.h>
-
-#include <QAbstractEventDispatcher>
-#include <QAbstractNativeEventFilter>
-#include <QtCore/private/qjni_p.h>
-
-#ifndef QT_NO_BEARERMANAGEMENT
-
-QT_BEGIN_NAMESPACE
-
-class QNetworkConfigurationPrivate;
-class QNetworkSessionPrivate;
-class AndroidConnectivityManager;
-
-class QAndroidBearerEngine : public QBearerEngineImpl
-{
-    Q_OBJECT
-
-public:
-    explicit QAndroidBearerEngine(QObject *parent = 0);
-    ~QAndroidBearerEngine() override;
-
-    QString getInterfaceFromId(const QString &id) override;
-    bool hasIdentifier(const QString &id) override;
-    void connectToId(const QString &id) override;
-    void disconnectFromId(const QString &id) override;
-    QNetworkSession::State sessionStateForId(const QString &id) override;
-    QNetworkConfigurationManager::Capabilities capabilities() const override;
-    QNetworkSessionPrivate *createSessionBackend() override;
-    QNetworkConfigurationPrivatePointer defaultConfiguration() override;
-    bool requiresPolling() const override;
-    quint64 bytesWritten(const QString &id) override;
-    quint64 bytesReceived(const QString &id) override;
-    quint64 startTime(const QString &id) override;
-
-    Q_INVOKABLE void initialize();
-    Q_INVOKABLE void requestUpdate();
-
-private Q_SLOTS:
-    void updateConfigurations();
-
-private:
-    QJNIObjectPrivate m_networkReceiver;
-    AndroidConnectivityManager *m_connectivityManager;
-    QMap<QString, QString> m_configurationInterface;
-};
-
-
-QT_END_NAMESPACE
-
-#endif // QT_NO_BEARERMANAGEMENT
-
-#endif // QANDROIDBEARERENGINE_H
diff --git a/src/plugins/bearer/android/src/src.pro b/src/plugins/bearer/android/src/src.pro
deleted file mode 100644
index fcd599dffe..0000000000
--- a/src/plugins/bearer/android/src/src.pro
+++ /dev/null
@@ -1,14 +0,0 @@
-TARGET = qandroidbearer
-
-QT = core-private network-private
-
-HEADERS += qandroidbearerengine.h
-
-SOURCES += main.cpp \
-           qandroidbearerengine.cpp
-
-include(wrappers/wrappers.pri)
-
-PLUGIN_TYPE = bearer
-PLUGIN_CLASS_NAME = QAndroidBearerEnginePlugin
-load(qt_plugin)
diff --git a/src/plugins/bearer/android/src/wrappers/androidconnectivitymanager.cpp b/src/plugins/bearer/android/src/wrappers/androidconnectivitymanager.cpp
deleted file mode 100644
index 6787690246..0000000000
--- a/src/plugins/bearer/android/src/wrappers/androidconnectivitymanager.cpp
+++ /dev/null
@@ -1,387 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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 https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://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 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "androidconnectivitymanager.h"
-#include <QtCore/private/qjni_p.h>
-#include <QtCore/private/qjnihelpers_p.h>
-
-QT_BEGIN_NAMESPACE
-
-static inline bool exceptionCheckAndClear(JNIEnv *env)
-{
-    if (!env->ExceptionCheck())
-        return false;
-
-#ifdef QT_DEBUG
-    env->ExceptionDescribe();
-#endif // QT_DEBUG
-    env->ExceptionClear();
-
-    return true;
-}
-
-struct AndroidConnectivityManagerInstance
-{
-    AndroidConnectivityManagerInstance()
-        : connManager(new AndroidConnectivityManager)
-    {    }
-    ~AndroidConnectivityManagerInstance()
-    {
-        delete connManager;
-    }
-
-    AndroidConnectivityManager* connManager;
-};
-
-Q_GLOBAL_STATIC(AndroidConnectivityManagerInstance, androidConnManagerInstance)
-
-static const char networkReceiverClass[] = "org/qtproject/qt5/android/bearer/QtNetworkReceiver";
-static const char trafficStatsClass[] = "android/net/TrafficStats";
-
-/**
- * Returns the number of bytes transmitted over the mobile network since last device boot.
- */
-qint64 AndroidTrafficStats::getMobileTxBytes()
-{
-    return QJNIObjectPrivate::callStaticMethod<jlong>(trafficStatsClass,
-                                                      "getMobileTxBytes",
-                                                      "()J");
-}
-
-/**
- * Returns the number of bytes received over the mobile network since last device boot.
- */
-qint64 AndroidTrafficStats::getMobileRxBytes()
-{
-    return QJNIObjectPrivate::callStaticMethod<jlong>(trafficStatsClass,
-                                                      "getMobileRxBytes",
-                                                      "()J");
-}
-
-/**
- * Returns the total transmitted bytes since last device boot.
- */
-qint64 AndroidTrafficStats::getTotalTxBytes()
-{
-    return QJNIObjectPrivate::callStaticMethod<jlong>(trafficStatsClass,
-                                                      "getTotalTxBytes",
-                                                      "()J");
-}
-
-/**
- * Returns the total received bytes since last device boot.
- */
-qint64 AndroidTrafficStats::getTotalRxBytes()
-{
-    return QJNIObjectPrivate::callStaticMethod<jlong>(trafficStatsClass,
-                                                      "getTotalRxBytes",
-                                                      "()J");
-}
-
-bool AndroidTrafficStats::isTrafficStatsSupported()
-{
-    // Before API level 18 DataStatistics might not be supported, so make sure that we get something
-    // else then -1 from from getXXBytes().
-    return (AndroidTrafficStats::getMobileRxBytes() != -1
-            && AndroidTrafficStats::getTotalRxBytes() != -1);
-}
-
-static AndroidNetworkInfo::NetworkState stateForName(const QString &stateName)
-{
-    if (stateName == QLatin1String("CONNECTED"))
-        return AndroidNetworkInfo::Connected;
-    else if (stateName == QLatin1String("CONNECTING"))
-        return AndroidNetworkInfo::Connecting;
-    else if (stateName == QLatin1String("DISCONNECTED"))
-        return AndroidNetworkInfo::Disconnected;
-    else if (stateName == QLatin1String("DISCONNECTING"))
-        return AndroidNetworkInfo::Disconnecting;
-    else if (stateName == QLatin1String("SUSPENDED"))
-        return AndroidNetworkInfo::Suspended;
-
-    return AndroidNetworkInfo::UnknownState;
-}
-
-AndroidNetworkInfo::NetworkState AndroidNetworkInfo::getDetailedState() const
-{
-    QJNIObjectPrivate enumObject = m_networkInfo.callObjectMethod("getDetailedState",
-                                                                  "()Landroid/net/NetworkInfo$DetailedState;");
-    if (!enumObject.isValid())
-        return UnknownState;
-
-    QJNIObjectPrivate enumName = enumObject.callObjectMethod<jstring>("name");
-    if (!enumName.isValid())
-        return UnknownState;
-
-    return stateForName(enumName.toString());
-}
-
-QString AndroidNetworkInfo::getExtraInfo() const
-{
-    QJNIObjectPrivate extraInfo = m_networkInfo.callObjectMethod<jstring>("getExtraInfo");
-    if (!extraInfo.isValid())
-        return QString();
-
-    return extraInfo.toString();
-}
-
-QString AndroidNetworkInfo::getReason() const
-{
-    QJNIObjectPrivate reason = m_networkInfo.callObjectMethod<jstring>("getReason");
-    if (!reason.isValid())
-        return QString();
-
-    return reason.toString();
-}
-
-AndroidNetworkInfo::NetworkState AndroidNetworkInfo::getState() const
-{
-    QJNIObjectPrivate enumObject = m_networkInfo.callObjectMethod("getState",
-                                                                  "()Landroid/net/NetworkInfo$State;");
-    if (!enumObject.isValid())
-        return UnknownState;
-
-    QJNIObjectPrivate enumName = enumObject.callObjectMethod<jstring>("name");
-    if (!enumName.isValid())
-        return UnknownState;
-
-    return stateForName(enumName.toString());
-}
-
-AndroidNetworkInfo::NetworkSubType AndroidNetworkInfo::getSubtype() const
-{
-    return AndroidNetworkInfo::NetworkSubType(m_networkInfo.callMethod<jint>("getSubtype"));
-}
-
-QString AndroidNetworkInfo::getSubtypeName() const
-{
-    QJNIObjectPrivate subtypeName = m_networkInfo.callObjectMethod<jstring>("getSubtypeName");
-    if (!subtypeName.isValid())
-        return QString();
-
-    return subtypeName.toString();
-}
-
-AndroidNetworkInfo::NetworkType AndroidNetworkInfo::getType() const
-{
-    return AndroidNetworkInfo::NetworkType(m_networkInfo.callMethod<jint>("getType"));
-}
-
-QString AndroidNetworkInfo::getTypeName() const
-{
-    QJNIObjectPrivate typeName = m_networkInfo.callObjectMethod<jstring>("getTypeName");
-    if (!typeName.isValid())
-        return QString();
-
-    return typeName.toString();
-}
-
-bool AndroidNetworkInfo::isAvailable() const
-{
-    return m_networkInfo.callMethod<jboolean>("isAvailable");
-}
-
-bool AndroidNetworkInfo::isConnected() const
-{
-    return m_networkInfo.callMethod<jboolean>("isConnected");
-}
-
-bool AndroidNetworkInfo::isConnectedOrConnecting() const
-{
-    return m_networkInfo.callMethod<jboolean>("isConnectedOrConnecting");
-}
-
-bool AndroidNetworkInfo::isFailover() const
-{
-    return m_networkInfo.callMethod<jboolean>("isFailover");
-}
-
-bool AndroidNetworkInfo::isRoaming() const
-{
-    return m_networkInfo.callMethod<jboolean>("isRoaming");
-}
-
-bool AndroidNetworkInfo::isValid() const
-{
-    return m_networkInfo.isValid();
-}
-
-AndroidConnectivityManager::AndroidConnectivityManager()
-{
-    QJNIEnvironmentPrivate env;
-    if (!registerNatives(env))
-        return;
-
-    m_connectivityManager = QJNIObjectPrivate::callStaticObjectMethod(networkReceiverClass,
-                                                                      "getConnectivityManager",
-                                                                      "(Landroid/content/Context;)Landroid/net/ConnectivityManager;",
-                                                                      QtAndroidPrivate::context());
-    if (!m_connectivityManager.isValid())
-        return;
-
-    QJNIObjectPrivate::callStaticMethod<void>(networkReceiverClass,
-                                              "registerReceiver",
-                                              "(Landroid/content/Context;)V",
-                                              QtAndroidPrivate::context());
-}
-
-AndroidConnectivityManager *AndroidConnectivityManager::getInstance()
-{
-    return androidConnManagerInstance->connManager->isValid()
-            ? androidConnManagerInstance->connManager
-            : 0;
-}
-
-AndroidConnectivityManager::~AndroidConnectivityManager()
-{
-    QJNIObjectPrivate::callStaticMethod<void>(networkReceiverClass,
-                                              "unregisterReceiver",
-                                              "(Landroid/content/Context;)V",
-                                              QtAndroidPrivate::context());
-}
-
-AndroidNetworkInfo AndroidConnectivityManager::getActiveNetworkInfo() const
-{
-    QJNIObjectPrivate networkInfo = m_connectivityManager.callObjectMethod("getActiveNetworkInfo",
-                                                                           "()Landroid/net/NetworkInfo;");
-    return networkInfo;
-}
-
-QList<AndroidNetworkInfo> AndroidConnectivityManager::getAllNetworkInfo() const
-{
-    QJNIEnvironmentPrivate env;
-    QJNIObjectPrivate objArray = m_connectivityManager.callObjectMethod("getAllNetworkInfo",
-                                                                        "()[Landroid/net/NetworkInfo;");
-    QList<AndroidNetworkInfo> list;
-    if (!objArray.isValid())
-        return list;
-
-    const jsize length = env->GetArrayLength(static_cast<jarray>(objArray.object()));
-    if (exceptionCheckAndClear(env))
-        return list;
-
-    for (int i = 0; i != length; ++i) {
-        jobject lref = env->GetObjectArrayElement(static_cast<jobjectArray>(objArray.object()), i);
-        if (exceptionCheckAndClear(env))
-            break;
-
-        list << AndroidNetworkInfo(QJNIObjectPrivate::fromLocalRef(lref));
-    }
-
-    return list;
-}
-
-bool AndroidConnectivityManager::getBackgroundDataSetting() const
-{
-    return m_connectivityManager.callMethod<jboolean>("getBackgroundDataSetting");
-}
-
-AndroidNetworkInfo AndroidConnectivityManager::getNetworkInfo(int networkType) const
-{
-    QJNIObjectPrivate networkInfo = m_connectivityManager.callObjectMethod("getNetworkInfo",
-                                                                           "(I)Landroid/net/NetworkInfo;",
-                                                                           networkType);
-    return networkInfo;
-}
-
-int AndroidConnectivityManager::getNetworkPreference() const
-{
-    return m_connectivityManager.callMethod<jint>("getNetworkPreference");
-}
-
-bool AndroidConnectivityManager::isActiveNetworkMetered() const
-{
-    return m_connectivityManager.callMethod<jboolean>("isActiveNetworkMetered");
-}
-
-bool AndroidConnectivityManager::isNetworkTypeValid(int networkType)
-{
-    return QJNIObjectPrivate::callStaticMethod<jboolean>("android/net/ConnectivityManager",
-                                                         "isNetworkTypeValid",
-                                                         "(I)Z",
-                                                         networkType);
-}
-
-bool AndroidConnectivityManager::requestRouteToHost(int networkType, int hostAddress)
-{
-    return m_connectivityManager.callMethod<jboolean>("requestRouteToHost", "(II)Z", networkType, hostAddress);
-}
-
-void AndroidConnectivityManager::setNetworkPreference(int preference)
-{
-    m_connectivityManager.callMethod<void>("setNetworkPreference", "(I)V", preference);
-}
-
-int AndroidConnectivityManager::startUsingNetworkFeature(int networkType, const QString &feature)
-{
-    QJNIObjectPrivate jfeature = QJNIObjectPrivate::fromString(feature);
-    return m_connectivityManager.callMethod<jint>("startUsingNetworkFeature",
-                                                  "(ILjava/lang/String;)I",
-                                                  networkType,
-                                                  jfeature.object());
-}
-
-int AndroidConnectivityManager::stopUsingNetworkFeature(int networkType, const QString &feature)
-{
-    QJNIObjectPrivate jfeature = QJNIObjectPrivate::fromString(feature);
-    return m_connectivityManager.callMethod<jint>("stopUsingNetworkFeature",
-                                                  "(ILjava/lang/String;)I",
-                                                  networkType,
-                                                  jfeature.object());
-}
-
-static void activeNetworkInfoChanged()
-{
-    Q_EMIT androidConnManagerInstance->connManager->activeNetworkChanged();
-}
-
-bool AndroidConnectivityManager::registerNatives(JNIEnv *env)
-{
-    QJNIObjectPrivate networkReceiver(networkReceiverClass);
-    if (!networkReceiver.isValid())
-        return false;
-
-    jclass clazz = env->GetObjectClass(networkReceiver.object());
-    static JNINativeMethod method = {"activeNetworkInfoChanged", "()V", reinterpret_cast<void *>(activeNetworkInfoChanged)};
-    const bool ret = (env->RegisterNatives(clazz, &method, 1) == JNI_OK);
-    env->DeleteLocalRef(clazz);
-    return ret;
-}
-
-QT_END_NAMESPACE
diff --git a/src/plugins/bearer/android/src/wrappers/androidconnectivitymanager.h b/src/plugins/bearer/android/src/wrappers/androidconnectivitymanager.h
deleted file mode 100644
index 7c410b0087..0000000000
--- a/src/plugins/bearer/android/src/wrappers/androidconnectivitymanager.h
+++ /dev/null
@@ -1,168 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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 https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://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 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef ANDROIDCONNECTIVITYMANAGER_H
-#define ANDROIDCONNECTIVITYMANAGER_H
-
-#include <QObject>
-#include <QtCore/private/qjni_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class AndroidTrafficStats
-{
-public:
-    static qint64 getMobileTxBytes();
-    static qint64 getMobileRxBytes();
-    static qint64 getTotalTxBytes();
-    static qint64 getTotalRxBytes();
-    static bool isTrafficStatsSupported();
-};
-
-class AndroidNetworkInfo
-{
-public:
-    // Needs to be in sync with the values from the android api.
-    enum NetworkState {
-        UnknownState,
-        Authenticating,
-        Blocked,
-        CaptivePortalCheck,
-        Connected,
-        Connecting,
-        Disconnected,
-        Disconnecting,
-        Failed,
-        Idle,
-        ObtainingIpAddr,
-        Scanning,
-        Suspended,
-        VerifyingPoorLink
-    };
-
-    enum NetworkType {
-        Mobile,
-        Wifi,
-        MobileMms,
-        MobileSupl,
-        MobileDun,
-        MobileHipri,
-        Wimax,
-        Bluetooth,
-        Dummy,
-        Ethernet,
-        UnknownType
-    };
-
-    enum NetworkSubType {
-        UnknownSubType,
-        Gprs,
-        Edge,
-        Umts,
-        Cdma,
-        Evdo0,
-        EvdoA,
-        Cdma1xRTT,
-        Hsdpa,
-        Hsupa,
-        Hspa,
-        Iden,
-        EvdoB,
-        Lte,
-        Ehrpd,
-        Hspap
-    };
-
-    inline AndroidNetworkInfo(const QJNIObjectPrivate &obj) : m_networkInfo(obj)
-    { }
-
-    NetworkState getDetailedState() const;
-    QString getExtraInfo() const;
-    QString getReason() const;
-    NetworkState getState() const;
-    NetworkSubType getSubtype() const;
-    QString getSubtypeName() const;
-    NetworkType getType() const;
-    QString getTypeName() const;
-    bool isAvailable() const;
-    bool isConnected() const;
-    bool isConnectedOrConnecting() const;
-    bool isFailover() const;
-    bool isRoaming() const;
-    bool isValid() const;
-
-private:
-    QJNIObjectPrivate m_networkInfo;
-};
-
-class AndroidConnectivityManager : public QObject
-{
-    Q_OBJECT
-public:
-    static AndroidConnectivityManager *getInstance();
-    ~AndroidConnectivityManager();
-
-    AndroidNetworkInfo getActiveNetworkInfo() const;
-    QList<AndroidNetworkInfo> getAllNetworkInfo() const;
-    bool getBackgroundDataSetting() const;
-    AndroidNetworkInfo getNetworkInfo(int networkType) const;
-    int getNetworkPreference() const;
-    bool isActiveNetworkMetered() const;
-    static bool isNetworkTypeValid(int networkType);
-    bool requestRouteToHost(int networkType, int hostAddress);
-    void setNetworkPreference(int preference);
-    int startUsingNetworkFeature(int networkType, const QString &feature);
-    int stopUsingNetworkFeature(int networkType, const QString &feature);
-    inline bool isValid() const
-    {
-        return m_connectivityManager.isValid();
-    }
-
-    Q_SIGNAL void activeNetworkChanged();
-
-private:
-    friend struct AndroidConnectivityManagerInstance;
-    AndroidConnectivityManager();
-    bool registerNatives(JNIEnv *env);
-    QJNIObjectPrivate m_connectivityManager;
-};
-
-QT_END_NAMESPACE
-
-#endif // ANDROIDCONNECTIVITYMANAGER_H
diff --git a/src/plugins/bearer/android/src/wrappers/wrappers.pri b/src/plugins/bearer/android/src/wrappers/wrappers.pri
deleted file mode 100644
index 209b76e533..0000000000
--- a/src/plugins/bearer/android/src/wrappers/wrappers.pri
+++ /dev/null
@@ -1,6 +0,0 @@
-INCLUDEPATH += $$PWD
-
-HEADERS += \
-           $$PWD/androidconnectivitymanager.h
-SOURCES += \
-           $$PWD/androidconnectivitymanager.cpp