simulator: Remove DeviceInfo and NetworkInfo support

These will not be supported anymore and removed from simulator backend.

Change-Id: Ib3ae3130c234598145821a5c8c5b6fb49be1d8df
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>

13 files changed, 15 insertions, 1948 deletions

diff --git a/src/systeminfo/qdeviceinfo.cpp b/src/systeminfo/qdeviceinfo.cpp
index 00f81363..f6889bf3 100644
--- a/src/systeminfo/qdeviceinfo.cpp
+++ b/src/systeminfo/qdeviceinfo.cpp
@@ -33,9 +33,7 @@
 
 #include "qdeviceinfo.h"
 
-#if defined(QT_SIMULATOR)
-#  include "simulator/qsysteminfo_simulator_p.h"
-#elif defined(Q_OS_LINUX)
+#if defined(Q_OS_LINUX)
 #  include "linux/qdeviceinfo_linux_p.h"
 #elif defined(Q_OS_WIN)
 #  include "windows/qdeviceinfo_win_p.h"
@@ -152,11 +150,7 @@ QT_BEGIN_NAMESPACE
 */
 QDeviceInfo::QDeviceInfo(QObject *parent)
     : QObject(parent)
-#if !defined(QT_SIMULATOR)
     , d_ptr(new QDeviceInfoPrivate(this))
-#else
-    , d_ptr(new QDeviceInfoSimulator(this))
-#endif // QT_SIMULATOR
 {
 }
 
@@ -309,7 +303,7 @@ extern QMetaMethod proxyToSourceSignal(const QMetaMethod &, QObject *);
 */
 void QDeviceInfo::connectNotify(const QMetaMethod &signalSig)
 {
-#if defined(Q_OS_LINUX) || defined(Q_OS_WIN) || defined(QT_SIMULATOR) || defined(Q_OS_MAC)
+#if defined(Q_OS_LINUX) || defined(Q_OS_WIN) || defined(Q_OS_MAC)
     QMetaMethod sourceSignal = proxyToSourceSignal(signalSig, reinterpret_cast<QObject *>(d_ptr));
     connect(reinterpret_cast<QObject *>(d_ptr), sourceSignal, this, signalSig, Qt::UniqueConnection);
 #else
@@ -322,7 +316,7 @@ void QDeviceInfo::connectNotify(const QMetaMethod &signalSig)
 */
 void QDeviceInfo::disconnectNotify(const QMetaMethod &signalSig)
 {
-#if defined(Q_OS_LINUX) || defined(Q_OS_WIN) || defined(QT_SIMULATOR) || defined(Q_OS_MAC)
+#if defined(Q_OS_LINUX) || defined(Q_OS_WIN) || defined(Q_OS_MAC)
     // We can only disconnect with the private implementation, when there is no receivers for the signal.
     if (isSignalConnected(signalSig))
         return;
diff --git a/src/systeminfo/qdeviceinfo.h b/src/systeminfo/qdeviceinfo.h
index c20dc67c..3149d9ed 100644
--- a/src/systeminfo/qdeviceinfo.h
+++ b/src/systeminfo/qdeviceinfo.h
@@ -39,11 +39,7 @@
 
 QT_BEGIN_NAMESPACE
 
-#if !defined(QT_SIMULATOR)
 class QDeviceInfoPrivate;
-#else
-class QDeviceInfoSimulator;
-#endif // QT_SIMULATOR
 
 class Q_SYSTEMINFO_EXPORT QDeviceInfo : public QObject
 {
@@ -133,12 +129,8 @@ protected:
 
 private:
     Q_DISABLE_COPY(QDeviceInfo)
-#if !defined(QT_SIMULATOR)
     QDeviceInfoPrivate * const d_ptr;
     Q_DECLARE_PRIVATE(QDeviceInfo)
-#else
-    QDeviceInfoSimulator * const d_ptr;
-#endif // QT_SIMULATOR
 };
 
 QT_END_NAMESPACE
diff --git a/src/systeminfo/qnetworkinfo.cpp b/src/systeminfo/qnetworkinfo.cpp
index ea994331..58b6450c 100644
--- a/src/systeminfo/qnetworkinfo.cpp
+++ b/src/systeminfo/qnetworkinfo.cpp
@@ -33,9 +33,7 @@
 
 #include "qnetworkinfo.h"
 
-#if defined(QT_SIMULATOR)
-#  include "simulator/qsysteminfo_simulator_p.h"
-#elif defined(Q_OS_LINUX)
+#if defined(Q_OS_LINUX)
 #  include "linux/qnetworkinfo_linux_p.h"
 #elif defined(Q_OS_WIN)
 #  include "windows/qnetworkinfo_win_p.h"
@@ -194,11 +192,7 @@ QT_BEGIN_NAMESPACE
 */
 QNetworkInfo::QNetworkInfo(QObject *parent)
     : QObject(parent)
-#if !defined(QT_SIMULATOR)
     , d_ptr(new QNetworkInfoPrivate(this))
-#else
-    , d_ptr(new QNetworkInfoSimulator(this))
-#endif // QT_SIMULATOR
 {
 }
 
@@ -354,7 +348,7 @@ extern QMetaMethod proxyToSourceSignal(const QMetaMethod &, QObject *);
 */
 void QNetworkInfo::connectNotify(const QMetaMethod &signal)
 {
-#if defined(Q_OS_LINUX) || defined(Q_OS_WIN) || defined(QT_SIMULATOR) || defined(Q_OS_MAC)
+#if defined(Q_OS_LINUX) || defined(Q_OS_WIN) || defined(Q_OS_MAC)
     QMetaMethod sourceSignal = proxyToSourceSignal(signal, d_ptr);
     connect(d_ptr, sourceSignal, this, signal, Qt::UniqueConnection);
 #else
@@ -367,7 +361,7 @@ void QNetworkInfo::connectNotify(const QMetaMethod &signal)
 */
 void QNetworkInfo::disconnectNotify(const QMetaMethod &signal)
 {
-#if defined(Q_OS_LINUX) || defined(Q_OS_WIN) || defined(QT_SIMULATOR) || defined(Q_OS_MAC)
+#if defined(Q_OS_LINUX) || defined(Q_OS_WIN)  || defined(Q_OS_MAC)
     // We can only disconnect with the private implementation, when there is no receivers for the signal.
     if (isSignalConnected(signal))
         return;
diff --git a/src/systeminfo/qnetworkinfo.h b/src/systeminfo/qnetworkinfo.h
index 2430caf5..daab6e42 100644
--- a/src/systeminfo/qnetworkinfo.h
+++ b/src/systeminfo/qnetworkinfo.h
@@ -40,11 +40,7 @@
 
 QT_BEGIN_NAMESPACE
 
-#if !defined(QT_SIMULATOR)
 class QNetworkInfoPrivate;
-#else
-class QNetworkInfoSimulator;
-#endif // QT_SIMULATOR
 
 class Q_SYSTEMINFO_EXPORT QNetworkInfo : public QObject
 {
@@ -123,12 +119,8 @@ protected:
 
 private:
     Q_DISABLE_COPY(QNetworkInfo)
-#if !defined(QT_SIMULATOR)
     QNetworkInfoPrivate * const d_ptr;
     Q_DECLARE_PRIVATE(QNetworkInfo)
-#else
-    QNetworkInfoSimulator * const d_ptr;
-#endif // QT_SIMULATOR
 };
 
 QT_END_NAMESPACE
diff --git a/src/systeminfo/simulator/qsysteminfo_simulator.cpp b/src/systeminfo/simulator/qsysteminfo_simulator.cpp
index a68c7a40..dfde0018 100644
--- a/src/systeminfo/simulator/qsysteminfo_simulator.cpp
+++ b/src/systeminfo/simulator/qsysteminfo_simulator.cpp
@@ -36,10 +36,6 @@
 #include "qsysteminfobackend_simulator_p.h"
 #include "qsysteminfoconnection_simulator_p.h"
 
-#if !defined(QT_NO_OFONO)
-#  include "qnetworkinfo_linux_p.h"
-#endif
-
 #include <QtCore/qmetaobject.h>
 
 QT_BEGIN_NAMESPACE
@@ -276,549 +272,4 @@ void QBatteryInfoSimulator::disconnectNotify(const QMetaMethod &signal)
     }
 }
 
-
-// QDeviceInfoSimulator
-
-QDeviceInfoSimulator::QDeviceInfoSimulator(QDeviceInfo *parent)
-    : QObject(parent)
-    , q_ptr(parent)
-    , deviceInfoSimulatorBackend(QDeviceInfoSimulatorBackend::getSimulatorBackend())
-{
-    SystemInfoConnection::ensureSimulatorConnection();
-}
-
-QDeviceInfoSimulator::~QDeviceInfoSimulator()
-{
-}
-
-bool QDeviceInfoSimulator::hasFeature(QDeviceInfo::Feature feature)
-{
-    if (deviceInfoSimulatorBackend)
-        return deviceInfoSimulatorBackend->hasFeature(feature);
-
-    return false;
-}
-
-QDeviceInfo::LockTypeFlags QDeviceInfoSimulator::activatedLocks()
-{
-    if (deviceInfoSimulatorBackend)
-        return deviceInfoSimulatorBackend->getActivatedLocks();
-
-    return QDeviceInfo::NoLock;
-}
-
-QDeviceInfo::LockTypeFlags QDeviceInfoSimulator::enabledLocks()
-{
-    if (deviceInfoSimulatorBackend)
-        return deviceInfoSimulatorBackend->getEnabledLocks();
-
-    return QDeviceInfo::NoLock;
-}
-
-QDeviceInfo::ThermalState QDeviceInfoSimulator::thermalState()
-{
-    if (deviceInfoSimulatorBackend)
-        return deviceInfoSimulatorBackend->getThermalState();
-
-    return QDeviceInfo::UnknownThermal;
-}
-
-int QDeviceInfoSimulator::imeiCount()
-{
-    if (deviceInfoSimulatorBackend)
-        return deviceInfoSimulatorBackend->getImeiCount();
-
-    return -1;
-}
-
-QString QDeviceInfoSimulator::imei(int interface)
-{
-    if (deviceInfoSimulatorBackend)
-        return deviceInfoSimulatorBackend->getImei(interface);
-
-    return QString();
-}
-
-QString QDeviceInfoSimulator::manufacturer()
-{
-    if (deviceInfoSimulatorBackend)
-        return deviceInfoSimulatorBackend->getManufacturer();
-
-    return QString();
-}
-
-QString QDeviceInfoSimulator::model()
-{
-    if (deviceInfoSimulatorBackend)
-        return deviceInfoSimulatorBackend->getModel();
-
-    return QString();
-}
-
-QString QDeviceInfoSimulator::productName()
-{
-    if (deviceInfoSimulatorBackend)
-        return deviceInfoSimulatorBackend->getProductName();
-
-    return QString();
-}
-
-QString QDeviceInfoSimulator::uniqueDeviceID()
-{
-    if (deviceInfoSimulatorBackend)
-        return deviceInfoSimulatorBackend->getUniqueDeviceID();
-
-    return QString();
-}
-
-QString QDeviceInfoSimulator::version(QDeviceInfo::Version type)
-{
-    if (deviceInfoSimulatorBackend)
-        return deviceInfoSimulatorBackend->getVersion(type);
-
-    return QString();
-}
-
-QString QDeviceInfoSimulator::operatingSystemName()
-{
-    return QString();
-}
-
-QString QDeviceInfoSimulator::boardName()
-{
-    return QString();
-}
-
-void QDeviceInfoSimulator::connectNotify(const QMetaMethod &signal)
-{
-    static const QMetaMethod activatedLocksChangedSignal = QMetaMethod::fromSignal(&QDeviceInfoSimulator::activatedLocksChanged);
-    static const QMetaMethod enabledLocksChangedSignal = QMetaMethod::fromSignal(&QDeviceInfoSimulator::enabledLocksChanged);
-    static const QMetaMethod thermalStateChangedSignal = QMetaMethod::fromSignal(&QDeviceInfoSimulator::thermalStateChanged);
-
-    if (signal == activatedLocksChangedSignal || signal == enabledLocksChangedSignal) {
-        if (deviceInfoSimulatorBackend) {
-            QMetaMethod sourceSignal = proxyToSourceSignal(signal, deviceInfoSimulatorBackend);
-            connect(deviceInfoSimulatorBackend, sourceSignal, this, signal);
-        }
-        return;
-    }
-
-    if (deviceInfoSimulatorBackend && signal == thermalStateChangedSignal) {
-        QMetaMethod sourceSignal = proxyToSourceSignal(signal, deviceInfoSimulatorBackend);
-        connect(deviceInfoSimulatorBackend, sourceSignal, this, signal);
-    }
-}
-
-void QDeviceInfoSimulator::disconnectNotify(const QMetaMethod &signal)
-{
-    static const QMetaMethod activatedLocksChangedSignal = QMetaMethod::fromSignal(&QDeviceInfoSimulator::activatedLocksChanged);
-    static const QMetaMethod enabledLocksChangedSignal = QMetaMethod::fromSignal(&QDeviceInfoSimulator::enabledLocksChanged);
-    static const QMetaMethod thermalStateChangedSignal = QMetaMethod::fromSignal(&QDeviceInfoSimulator::thermalStateChanged);
-
-    if (signal == activatedLocksChangedSignal || signal == enabledLocksChangedSignal) {
-        if (deviceInfoSimulatorBackend) {
-            QMetaMethod sourceSignal = proxyToSourceSignal(signal, deviceInfoSimulatorBackend);
-            disconnect(deviceInfoSimulatorBackend, sourceSignal, this, signal);
-        }
-        return;
-    }
-
-    if (deviceInfoSimulatorBackend && signal == thermalStateChangedSignal) {
-        QMetaMethod sourceSignal = proxyToSourceSignal(signal, deviceInfoSimulatorBackend);
-        disconnect(deviceInfoSimulatorBackend, sourceSignal, this, signal);
-    }
-}
-
-bool QDeviceInfoSimulator::currentBluetoothPowerState()
-{
-    return false;
-}
-
-// QNetworkInfoSimulator
-
-QNetworkInfoSimulator::QNetworkInfoSimulator(QNetworkInfo *parent)
-    : QObject(parent)
-    , q_ptr(parent)
-    , networkInfoSimulatorBackend(QNetworkInfoSimulatorBackend::getSimulatorBackend())
-#if !defined(QT_NO_OFONO)
-    , d_ptr(new QNetworkInfoPrivate())
-#endif
-{
-    SystemInfoConnection::ensureSimulatorConnection();
-}
-
-QNetworkInfoSimulator::~QNetworkInfoSimulator()
-{
-#if !defined(QT_NO_OFONO)
-    delete d_ptr;
-#endif
-}
-
-int QNetworkInfoSimulator::networkInterfaceCount(QNetworkInfo::NetworkMode mode)
-{
-#if !defined(QT_NO_OFONO)
-    if (mode != QNetworkInfo::WlanMode) {
-        if (d_ptr)
-            return d_ptr->networkInterfaceCount(mode);
-        else
-            return -1;
-    }
-#endif
-    if (networkInfoSimulatorBackend)
-        return networkInfoSimulatorBackend->getNetworkInterfaceCount(mode);
-    return -1;
-}
-
-int QNetworkInfoSimulator::networkSignalStrength(QNetworkInfo::NetworkMode mode, int interface)
-{
-#if !defined(QT_NO_OFONO)
-    if (mode != QNetworkInfo::WlanMode) {
-        if (d_ptr)
-            return d_ptr->networkSignalStrength(mode, interface);
-        else
-            return -1;
-    }
-#endif
-    if (networkInfoSimulatorBackend)
-        return networkInfoSimulatorBackend->getNetworkSignalStrength(mode, interface);
-    return -1;
-}
-
-QNetworkInfo::CellDataTechnology QNetworkInfoSimulator::currentCellDataTechnology(int interface)
-{
-#if !defined(QT_NO_OFONO)
-        if (d_ptr)
-            return d_ptr->currentCellDataTechnology(interface);
-        else
-            return QNetworkInfo::UnknownDataTechnology;
-#endif
-    if (networkInfoSimulatorBackend)
-        return networkInfoSimulatorBackend->getCurrentCellDataTechnology(interface);
-    return QNetworkInfo::UnknownDataTechnology;
-}
-
-QNetworkInfo::NetworkMode QNetworkInfoSimulator::currentNetworkMode()
-{
-    QNetworkInfo::NetworkMode mode = QNetworkInfo::UnknownMode;
-    if (networkInfoSimulatorBackend)
-        mode = networkInfoSimulatorBackend->getCurrentNetworkMode();
-#if !defined(QT_NO_OFONO)
-    QNetworkInfo::NetworkMode mode2 = QNetworkInfo::UnknownMode;
-        if (d_ptr)
-            mode2 = d_ptr->currentNetworkMode();
-        switch (mode) {
-        case QNetworkInfo::WlanMode:
-            if (mode2 == QNetworkInfo::EthernetMode)
-                mode = mode2;
-            break;
-        default:
-            mode = mode2;
-            break;
-        }
-
-#endif
-    return mode;
-}
-
-QNetworkInfo::NetworkStatus QNetworkInfoSimulator::networkStatus(QNetworkInfo::NetworkMode mode, int interface)
-{
-#if !defined(QT_NO_OFONO)
-    if (mode != QNetworkInfo::WlanMode) {
-        if (d_ptr)
-            return d_ptr->networkStatus(mode, interface);
-        else
-            return QNetworkInfo::UnknownStatus;
-    }
-#endif
-    if (networkInfoSimulatorBackend)
-        return networkInfoSimulatorBackend->getNetworkStatus(mode, interface);
-    return QNetworkInfo::UnknownStatus;
-}
-
-#ifndef QT_NO_NETWORKINTERFACE
-QNetworkInterface QNetworkInfoSimulator::interfaceForMode(QNetworkInfo::NetworkMode mode, int interface)
-{
-#if !defined(QT_NO_OFONO)
-    if (mode != QNetworkInfo::WlanMode) {
-        if (d_ptr)
-            return d_ptr->interfaceForMode(mode, interface);
-        else
-            return QNetworkInterface();
-    }
-#endif
-    if (networkInfoSimulatorBackend)
-        return networkInfoSimulatorBackend->getInterfaceForMode(mode, interface);
-    return QNetworkInterface();
-}
-#endif // QT_NO_NETWORKINTERFACE
-
-QString QNetworkInfoSimulator::cellId(int interface)
-{
-#if !defined(QT_NO_OFONO)
-    if (d_ptr)
-        return d_ptr->cellId(interface);
-    else
-        return QString();
-#endif
-    if (networkInfoSimulatorBackend)
-        return networkInfoSimulatorBackend->getCellId(interface);
-    return QString();
-}
-
-QString QNetworkInfoSimulator::currentMobileCountryCode(int interface)
-{
-#if !defined(QT_NO_OFONO)
-    if (d_ptr)
-        return d_ptr->currentMobileCountryCode(interface);
-    else
-        return QString();
-#endif
-    if (networkInfoSimulatorBackend)
-        return networkInfoSimulatorBackend->getCurrentMobileCountryCode(interface);
-    return QString();
-}
-
-QString QNetworkInfoSimulator::currentMobileNetworkCode(int interface)
-{
-#if !defined(QT_NO_OFONO)
-    if (d_ptr)
-        return d_ptr->currentMobileNetworkCode(interface);
-    else
-        return QString();
-#endif
-    if (networkInfoSimulatorBackend)
-        return networkInfoSimulatorBackend->getCurrentMobileNetworkCode(interface);
-    return QString();
-}
-
-QString QNetworkInfoSimulator::homeMobileCountryCode(int interface)
-{
-#if !defined(QT_NO_OFONO)
-    if (d_ptr)
-        return d_ptr->homeMobileCountryCode(interface);
-    else
-        return QString();
-#endif
-    if (networkInfoSimulatorBackend)
-        return networkInfoSimulatorBackend->getHomeMobileCountryCode(interface);
-    return QString();
-}
-
-QString QNetworkInfoSimulator::homeMobileNetworkCode(int interface)
-{
-#if !defined(QT_NO_OFONO)
-    if (d_ptr)
-        return d_ptr->homeMobileNetworkCode(interface);
-    else
-        return QString();
-#endif
-    if (networkInfoSimulatorBackend)
-        return networkInfoSimulatorBackend->getHomeMobileNetworkCode(interface);
-    return QString();
-}
-
-QString QNetworkInfoSimulator::imsi(int interface)
-{
-#if !defined(QT_NO_OFONO)
-    if (d_ptr)
-        return d_ptr->imsi(interface);
-    else
-        return QString();
-#endif
-    if (networkInfoSimulatorBackend)
-        return networkInfoSimulatorBackend->getImsi(interface);
-    return QString();
-}
-
-QString QNetworkInfoSimulator::locationAreaCode(int interface)
-{
-#if !defined(QT_NO_OFONO)
-    if (d_ptr)
-        return d_ptr->locationAreaCode(interface);
-    else
-        return QString();
-#endif
-    if (networkInfoSimulatorBackend)
-        return networkInfoSimulatorBackend->getLocationAreaCode(interface);
-    return QString();
-}
-
-QString QNetworkInfoSimulator::macAddress(QNetworkInfo::NetworkMode mode, int interface)
-{
-#if !defined(QT_NO_OFONO)
-    if (mode != QNetworkInfo::WlanMode) {
-        if (d_ptr)
-            return d_ptr->macAddress(mode, interface);
-        else
-            return QString();
-    }
-#endif
-    if (networkInfoSimulatorBackend)
-        return networkInfoSimulatorBackend->getMacAddress(mode, interface);
-    return QString();
-}
-
-QString QNetworkInfoSimulator::networkName(QNetworkInfo::NetworkMode mode, int interface)
-{
-#if !defined(QT_NO_OFONO)
-    if (mode != QNetworkInfo::WlanMode) {
-        if (d_ptr)
-            return d_ptr->networkName(mode, interface);
-        else
-            return QString();
-    }
-#endif
-    if (networkInfoSimulatorBackend)
-        return networkInfoSimulatorBackend->getNetworkName(mode, interface);
-    return QString();
-}
-
-void QNetworkInfoSimulator::connectNotify(const QMetaMethod &signal)
-{
-    static const QMetaMethod networkInterfaceCountChangedSignal = QMetaMethod::fromSignal(&QNetworkInfoSimulator::networkInterfaceCountChanged);
-    static const QMetaMethod currentNetworkModeChangedSignal = QMetaMethod::fromSignal(&QNetworkInfoSimulator::currentNetworkModeChanged);
-    static const QMetaMethod networkNameChangedSignal = QMetaMethod::fromSignal(&QNetworkInfoSimulator::networkNameChanged);
-    static const QMetaMethod networkSignalStrengthChangedSignal = QMetaMethod::fromSignal(&QNetworkInfoSimulator::networkSignalStrengthChanged);
-    static const QMetaMethod networkStatusChangedSignal = QMetaMethod::fromSignal(&QNetworkInfoSimulator::networkStatusChanged);
-
-#if !defined(QT_NO_OFONO)
-    if (signal == networkInterfaceCountChangedSignal) {
-        if (networkInfoSimulatorBackend)
-            connect(networkInfoSimulatorBackend, SIGNAL(networkInterfaceCountChanged(QNetworkInfo::NetworkMode,int)), this, SLOT(onNetworkInterfaceCountChanged(QNetworkInfo::NetworkMode,int)), Qt::UniqueConnection);
-        if (d_ptr)
-            connect(d_ptr, SIGNAL(networkInterfaceCountChanged(QNetworkInfo::NetworkMode,int)), this, SLOT(onNetworkInterfaceCountChanged(QNetworkInfo::NetworkMode,int)), Qt::UniqueConnection);
-        return;
-    } else if (signal == currentNetworkModeChangedSignal) {
-        if (networkInfoSimulatorBackend)
-            connect(networkInfoSimulatorBackend, SIGNAL(currentNetworkModeChanged(QNetworkInfo::NetworkMode)), this, SLOT(onCurrentNetworkModeChanged(QNetworkInfo::NetworkMode)), Qt::UniqueConnection);
-        if (d_ptr)
-            connect(d_ptr, SIGNAL(currentNetworkModeChanged(QNetworkInfo::NetworkMode)), this, SLOT(onCurrentNetworkModeChanged(QNetworkInfo::NetworkMode)), Qt::UniqueConnection);
-        return;
-    } else if (signal == networkNameChangedSignal) {
-        if (networkInfoSimulatorBackend)
-            connect(networkInfoSimulatorBackend, SIGNAL(networkNameChanged(QNetworkInfo::NetworkMode,int,QString)), this, SLOT(onNetworkNameChanged(QNetworkInfo::NetworkMode,int,QString)), Qt::UniqueConnection);
-        if (d_ptr)
-            connect(d_ptr, SIGNAL(networkNameChanged(QNetworkInfo::NetworkMode,int,QString)), this, SLOT(onNetworkNameChanged(QNetworkInfo::NetworkMode,int,QString)), Qt::UniqueConnection);
-        return;
-    } else if (signal == networkSignalStrengthChangedSignal) {
-        if (networkInfoSimulatorBackend)
-            connect(networkInfoSimulatorBackend, SIGNAL(networkSignalStrengthChanged(QNetworkInfo::NetworkMode,int,int)), this, SLOT(onNetworkSignalStrengthChanged(QNetworkInfo::NetworkMode,int,int)), Qt::UniqueConnection);
-        if (d_ptr)
-            connect(d_ptr, SIGNAL(networkSignalStrengthChanged(QNetworkInfo::NetworkMode,int,int)), this, SLOT(onNetworkSignalStrengthChanged(QNetworkInfo::NetworkMode,int,int)), Qt::UniqueConnection);
-        return;
-    } else if (signal == networkStatusChangedSignal) {
-        if (networkInfoSimulatorBackend)
-            connect(networkInfoSimulatorBackend, SIGNAL(networkStatusChanged(QNetworkInfo::NetworkMode,int,QNetworkInfo::NetworkStatus)), this, SLOT(onNetworkStatusChanged(QNetworkInfo::NetworkMode,int,QNetworkInfo::NetworkStatus)), Qt::UniqueConnection);
-        if (d_ptr)
-            connect(d_ptr, SIGNAL(networkStatusChanged(QNetworkInfo::NetworkMode,int,QNetworkInfo::NetworkStatus)), this, SLOT(onNetworkStatusChanged(QNetworkInfo::NetworkMode,int,QNetworkInfo::NetworkStatus)), Qt::UniqueConnection);
-        return;
-    }
-#endif
-    if (networkInfoSimulatorBackend) {
-        QMetaMethod sourceSignal = proxyToSourceSignal(signal, networkInfoSimulatorBackend);
-        connect(networkInfoSimulatorBackend, sourceSignal, this, signal, Qt::UniqueConnection);
-    }
-}
-
-void QNetworkInfoSimulator::disconnectNotify(const QMetaMethod &signal)
-{
-    static const QMetaMethod networkInterfaceCountChangedSignal = QMetaMethod::fromSignal(&QNetworkInfoSimulator::networkInterfaceCountChanged);
-    static const QMetaMethod currentNetworkModeChangedSignal = QMetaMethod::fromSignal(&QNetworkInfoSimulator::currentNetworkModeChanged);
-    static const QMetaMethod networkNameChangedSignal = QMetaMethod::fromSignal(&QNetworkInfoSimulator::networkNameChanged);
-    static const QMetaMethod networkSignalStrengthChangedSignal = QMetaMethod::fromSignal(&QNetworkInfoSimulator::networkSignalStrengthChanged);
-    static const QMetaMethod networkStatusChangedSignal = QMetaMethod::fromSignal(&QNetworkInfoSimulator::networkStatusChanged);
-
-#if !defined(QT_NO_OFONO)
-    if (signal == networkInterfaceCountChangedSignal) {
-        if (networkInfoSimulatorBackend)
-            disconnect(networkInfoSimulatorBackend, SIGNAL(networkInterfaceCountChanged(QNetworkInfo::NetworkMode,int)), this, SLOT(onNetworkInterfaceCountChanged(QNetworkInfo::NetworkMode,int)));
-        if (d_ptr)
-            disconnect(d_ptr, SIGNAL(networkInterfaceCountChanged(QNetworkInfo::NetworkMode,int)), this, SLOT(onNetworkInterfaceCountChanged(QNetworkInfo::NetworkMode,int)));
-        return;
-    } else if (signal == currentNetworkModeChangedSignal) {
-        if (networkInfoSimulatorBackend)
-            disconnect(networkInfoSimulatorBackend, SIGNAL(currentNetworkModeChanged(QNetworkInfo::NetworkMode)), this, SLOT(onCurrentNetworkModeChanged(QNetworkInfo::NetworkMode)));
-        if (d_ptr)
-            disconnect(d_ptr, SIGNAL(currentNetworkModeChanged(QNetworkInfo::NetworkMode)), this, SLOT(onCurrentNetworkModeChanged(QNetworkInfo::NetworkMode)));
-        return;
-    } else if (signal == networkNameChangedSignal) {
-        if (networkInfoSimulatorBackend)
-            disconnect(networkInfoSimulatorBackend, SIGNAL(networkNameChanged(QNetworkInfo::NetworkMode,int,QString)), this, SLOT(onNetworkNameChanged(QNetworkInfo::NetworkMode,int,QString)));
-        if (d_ptr)
-            disconnect(d_ptr, SIGNAL(networkNameChanged(QNetworkInfo::NetworkMode,int,QString)), this, SLOT(onNetworkNameChanged(QNetworkInfo::NetworkMode,int,QString)));
-        return;
-    } else if (signal == networkSignalStrengthChangedSignal) {
-        if (networkInfoSimulatorBackend)
-            disconnect(networkInfoSimulatorBackend, SIGNAL(networkSignalStrengthChanged(QNetworkInfo::NetworkMode,int,int)), this, SLOT(onNetworkSignalStrengthChanged(QNetworkInfo::NetworkMode,int,int)));
-        if (d_ptr)
-            disconnect(d_ptr, SIGNAL(networkSignalStrengthChanged(QNetworkInfo::NetworkMode,int,int)), this, SLOT(onNetworkSignalStrengthChanged(QNetworkInfo::NetworkMode,int,int)));
-        return;
-    } else if (signal == networkStatusChangedSignal) {
-        if (networkInfoSimulatorBackend)
-            disconnect(networkInfoSimulatorBackend, SIGNAL(networkStatusChanged(QNetworkInfo::NetworkMode,int,QNetworkInfo::NetworkStatus)), this, SLOT(onNetworkStatusChanged(QNetworkInfo::NetworkMode,int,QNetworkInfo::NetworkStatus)));
-        if (d_ptr)
-            disconnect(d_ptr, SIGNAL(networkStatusChanged(QNetworkInfo::NetworkMode,int,QNetworkInfo::NetworkStatus)), this, SLOT(onNetworkStatusChanged(QNetworkInfo::NetworkMode,int,QNetworkInfo::NetworkStatus)));
-        return;
-    }
-#endif
-    if (networkInfoSimulatorBackend) {
-        QMetaMethod sourceSignal = proxyToSourceSignal(signal, networkInfoSimulatorBackend);
-        disconnect(networkInfoSimulatorBackend, sourceSignal, this, signal);
-    }
-}
-
-#if !defined(QT_NO_OFONO)
-
-void QNetworkInfoSimulator::onCurrentNetworkModeChanged(QNetworkInfo::NetworkMode mode)
-{
-    Q_UNUSED(mode)
-    emit currentNetworkModeChanged(currentNetworkMode());
-}
-
-void QNetworkInfoSimulator::onNetworkInterfaceCountChanged(QNetworkInfo::NetworkMode mode, int count)
-{
-    if (strcmp(sender()->metaObject()->className(), "QNetworkInfoSimulatorBackend") == 0) {
-        if (mode == QNetworkInfo::WlanMode)
-            emit networkInterfaceCountChanged(mode, count);
-    } else {
-        if (mode != QNetworkInfo::WlanMode)
-            emit networkInterfaceCountChanged(mode, count);
-    }
-}
-
-void QNetworkInfoSimulator::onNetworkNameChanged(QNetworkInfo::NetworkMode mode, int interface, const QString &name)
-{
-    if (strcmp(sender()->metaObject()->className(), "QNetworkInfoSimulatorBackend") == 0) {
-        if (mode == QNetworkInfo::WlanMode)
-            emit networkNameChanged(mode, interface, name);
-    } else {
-        if (mode != QNetworkInfo::WlanMode)
-            emit networkNameChanged(mode, interface, name);
-    }
-}
-
-void QNetworkInfoSimulator::onNetworkSignalStrengthChanged(QNetworkInfo::NetworkMode mode, int interface, int strength)
-{
-    if (strcmp(sender()->metaObject()->className(), "QNetworkInfoSimulatorBackend") == 0) {
-        if (mode == QNetworkInfo::WlanMode)
-            emit networkSignalStrengthChanged(mode, interface, strength);
-    } else {
-        if (mode != QNetworkInfo::WlanMode)
-            emit networkSignalStrengthChanged(mode, interface, strength);
-    }
-}
-
-void QNetworkInfoSimulator::onNetworkStatusChanged(QNetworkInfo::NetworkMode mode, int interface, QNetworkInfo::NetworkStatus status)
-{
-    if (strcmp(sender()->metaObject()->className(), "QNetworkInfoSimulatorBackend") == 0) {
-        if (mode == QNetworkInfo::WlanMode)
-            emit networkStatusChanged(mode, interface, status);
-    } else {
-        if (mode != QNetworkInfo::WlanMode)
-            emit networkStatusChanged(mode, interface, status);
-    }
-}
-
-#endif
-
 QT_END_NAMESPACE
diff --git a/src/systeminfo/simulator/qsysteminfo_simulator_p.h b/src/systeminfo/simulator/qsysteminfo_simulator_p.h
index 0100ecab..65e4ac34 100644
--- a/src/systeminfo/simulator/qsysteminfo_simulator_p.h
+++ b/src/systeminfo/simulator/qsysteminfo_simulator_p.h
@@ -48,18 +48,10 @@
 //
 
 #include <qbatteryinfo.h>
-#include <qdeviceinfo.h>
-#include <qnetworkinfo.h>
 
 QT_BEGIN_NAMESPACE
 
 class QBatteryInfoSimulatorBackend;
-class QDeviceInfoSimulatorBackend;
-class QNetworkInfoSimulatorBackend;
-
-#if !defined(QT_NO_OFONO)
-class QNetworkInfoPrivate;
-#endif
 
 class QBatteryInfoSimulator : public QObject
 {
@@ -120,106 +112,6 @@ private:
     QBatteryInfoSimulatorBackend *batteryInfoSimulatorBackend;
 };
 
-class QDeviceInfoSimulator : public QObject
-{
-    Q_OBJECT
-
-public:
-    QDeviceInfoSimulator(QDeviceInfo *parent);
-    ~QDeviceInfoSimulator();
-
-    bool hasFeature(QDeviceInfo::Feature feature);
-    int imeiCount();
-    QDeviceInfo::LockTypeFlags activatedLocks();
-    QDeviceInfo::LockTypeFlags enabledLocks();
-    QDeviceInfo::ThermalState thermalState();
-    QString imei(int interface);
-    QString manufacturer();
-    QString model();
-    QString productName();
-    QString uniqueDeviceID();
-    QString version(QDeviceInfo::Version type);
-    QString operatingSystemName();
-    QString boardName();
-    bool currentBluetoothPowerState();
-
-Q_SIGNALS:
-    void activatedLocksChanged(QDeviceInfo::LockTypeFlags types);
-    void enabledLocksChanged(QDeviceInfo::LockTypeFlags types);
-    void thermalStateChanged(QDeviceInfo::ThermalState state);
-
-protected:
-    void connectNotify(const QMetaMethod &signal);
-    void disconnectNotify(const QMetaMethod &signal);
-
-private:
-    QDeviceInfo * const q_ptr;
-    Q_DECLARE_PUBLIC(QDeviceInfo)
-
-    QDeviceInfoSimulatorBackend *deviceInfoSimulatorBackend;
-};
-
-class QNetworkInfoSimulator : public QObject
-{
-    Q_OBJECT
-
-public:
-    QNetworkInfoSimulator(QNetworkInfo *parent);
-    ~QNetworkInfoSimulator();
-
-    int networkInterfaceCount(QNetworkInfo::NetworkMode mode);
-    int networkSignalStrength(QNetworkInfo::NetworkMode mode, int interface);
-    QNetworkInfo::CellDataTechnology currentCellDataTechnology(int interface);
-    QNetworkInfo::NetworkMode currentNetworkMode();
-    QNetworkInfo::NetworkStatus networkStatus(QNetworkInfo::NetworkMode mode, int interface);
-#ifndef QT_NO_NETWORKINTERFACE
-    QNetworkInterface interfaceForMode(QNetworkInfo::NetworkMode mode, int interface);
-#endif // QT_NO_NETWORKINTERFACE
-    QString cellId(int interface);
-    QString currentMobileCountryCode(int interface);
-    QString currentMobileNetworkCode(int interface);
-    QString homeMobileCountryCode(int interface);
-    QString homeMobileNetworkCode(int interface);
-    QString imsi(int interface);
-    QString locationAreaCode(int interface);
-    QString macAddress(QNetworkInfo::NetworkMode mode, int interface);
-    QString networkName(QNetworkInfo::NetworkMode mode, int interface);
-
-Q_SIGNALS:
-    void cellIdChanged(int interface, const QString &id);
-    void currentCellDataTechnologyChanged(int interface, QNetworkInfo::CellDataTechnology tech);
-    void currentMobileCountryCodeChanged(int interface, const QString &mcc);
-    void currentMobileNetworkCodeChanged(int interface, const QString &mnc);
-    void currentNetworkModeChanged(QNetworkInfo::NetworkMode mode);
-    void locationAreaCodeChanged(int interface, const QString &lac);
-    void networkInterfaceCountChanged(QNetworkInfo::NetworkMode mode, int count);
-    void networkNameChanged(QNetworkInfo::NetworkMode mode, int interface, const QString &name);
-    void networkSignalStrengthChanged(QNetworkInfo::NetworkMode mode, int interface, int strength);
-    void networkStatusChanged(QNetworkInfo::NetworkMode mode, int interface, QNetworkInfo::NetworkStatus status);
-
-protected:
-    void connectNotify(const QMetaMethod &signal);
-    void disconnectNotify(const QMetaMethod &signal);
-
-private:
-    QNetworkInfo * const q_ptr;
-    Q_DECLARE_PUBLIC(QNetworkInfo)
-
-    QNetworkInfoSimulatorBackend *networkInfoSimulatorBackend;
-
-#if !defined(QT_NO_OFONO)
-    QNetworkInfoPrivate * const d_ptr;
-    Q_DECLARE_PRIVATE(QNetworkInfo)
-
-public Q_SLOTS:
-    void onCurrentNetworkModeChanged(QNetworkInfo::NetworkMode mode);
-    void onNetworkInterfaceCountChanged(QNetworkInfo::NetworkMode mode, int count);
-    void onNetworkNameChanged(QNetworkInfo::NetworkMode mode, int interface, const QString &name);
-    void onNetworkSignalStrengthChanged(QNetworkInfo::NetworkMode mode, int interface, int strength);
-    void onNetworkStatusChanged(QNetworkInfo::NetworkMode mode, int interface, QNetworkInfo::NetworkStatus status);
-#endif
-};
-
 QT_END_NAMESPACE
 
 #endif /*QSYSTEMINFO_SIMULATOR_P_H*/
diff --git a/src/systeminfo/simulator/qsysteminfobackend_simulator.cpp b/src/systeminfo/simulator/qsysteminfobackend_simulator.cpp
index c4067f2a..4d0562ee 100644
--- a/src/systeminfo/simulator/qsysteminfobackend_simulator.cpp
+++ b/src/systeminfo/simulator/qsysteminfobackend_simulator.cpp
@@ -39,9 +39,6 @@
 QT_BEGIN_NAMESPACE
 
 QBatteryInfoSimulatorBackend *QBatteryInfoSimulatorBackend::globalSimulatorBackend = 0;
-QDeviceInfoSimulatorBackend *QDeviceInfoSimulatorBackend::globalSimulatorBackend = 0;
-QNetworkInfoSimulatorBackend *QNetworkInfoSimulatorBackend::globalSimulatorBackend = 0;
-
 
 // QBatteryInfoSimulatorBackend
 
@@ -287,698 +284,4 @@ void QBatteryInfoSimulatorBackend::setTemperature(float temperature)
     }
 }
 
-// QDeviceInfoSimulatorBackend
-
-QDeviceInfoSimulatorBackend::QDeviceInfoSimulatorBackend(QObject *parent)
-    : QObject(parent)
-{
-    initFeatureList();
-    initImeiList();
-    initVersionList();
-    data.enabledLocks = QDeviceInfo::NoLock;
-    data.activatedLocks = QDeviceInfo::NoLock;
-    data.currentThermalState = QDeviceInfo::UnknownThermal;
-    data.manufacturer = QStringLiteral("Simulator Manufacturer");
-    data.model = QStringLiteral("Simulator Model");
-    data.productName =  QStringLiteral("Simulator Product Name");
-    data.uniqueDeviceID =  QStringLiteral("");
-}
-
-QDeviceInfoSimulatorBackend::~QDeviceInfoSimulatorBackend()
-{
-}
-
-QDeviceInfoSimulatorBackend *QDeviceInfoSimulatorBackend::getSimulatorBackend()
-{
-    static QMutex mutex;
-
-    mutex.lock();
-    if (!globalSimulatorBackend)
-        globalSimulatorBackend = new QDeviceInfoSimulatorBackend();
-    mutex.unlock();
-
-    return globalSimulatorBackend;
-}
-
-void QDeviceInfoSimulatorBackend::initFeatureList()
-{
-    data.featureList.insert(QDeviceInfo::BluetoothFeature, false);
-    data.featureList.insert(QDeviceInfo::CameraFeature, false);
-    data.featureList.insert(QDeviceInfo::FmRadioFeature, false);
-    data.featureList.insert(QDeviceInfo::FmTransmitterFeature, false);
-    data.featureList.insert(QDeviceInfo::InfraredFeature, false);
-    data.featureList.insert(QDeviceInfo::LedFeature, false);
-    data.featureList.insert(QDeviceInfo::MemoryCardFeature, false);
-    data.featureList.insert(QDeviceInfo::UsbFeature, false);
-    data.featureList.insert(QDeviceInfo::VibrationFeature, false);
-    data.featureList.insert(QDeviceInfo::WlanFeature, false);
-    data.featureList.insert(QDeviceInfo::SimFeature, false);
-    data.featureList.insert(QDeviceInfo::PositioningFeature, false);
-    data.featureList.insert(QDeviceInfo::VideoOutFeature, false);
-    data.featureList.insert(QDeviceInfo::HapticsFeature, false);
-    data.featureList.insert(QDeviceInfo::NfcFeature, false);
-}
-
-void QDeviceInfoSimulatorBackend::initImeiList()
-{
-    data.imeiList.insert(0, QStringLiteral("000000000000000"));
-    data.imeiList.insert(0, QStringLiteral("111111111111111"));
-}
-
-void QDeviceInfoSimulatorBackend::initVersionList()
-{
-    data.versionList[QDeviceInfo::Os] = QStringLiteral("1.0");
-    data.versionList[QDeviceInfo::Firmware] = QStringLiteral("1.0");
-}
-
-bool QDeviceInfoSimulatorBackend::hasFeature(QDeviceInfo::Feature feature)
-{
-    QHash<QDeviceInfo::Feature, bool>::const_iterator i = data.featureList.find(feature);
-    if (i != data.featureList.end())
-        return i.value();
-
-    return false;
-}
-
-int QDeviceInfoSimulatorBackend::getImeiCount()
-{
-    return data.imeiList.count();
-}
-
-QDeviceInfo::LockTypeFlags QDeviceInfoSimulatorBackend::getActivatedLocks()
-{
-    return data.activatedLocks;
-}
-
-QDeviceInfo::LockTypeFlags QDeviceInfoSimulatorBackend::getEnabledLocks()
-{
-    return data.enabledLocks;
-}
-
-QDeviceInfo::ThermalState QDeviceInfoSimulatorBackend::getThermalState()
-{
-    return data.currentThermalState;
-}
-
-QString QDeviceInfoSimulatorBackend::getImei(int num)
-{
-    if (num >= 0 && num < data.imeiList.count())
-        return data.imeiList.at(num);
-    return QString();
-}
-
-QString QDeviceInfoSimulatorBackend::getManufacturer()
-{
-    return data.manufacturer;
-}
-
-QString QDeviceInfoSimulatorBackend::getModel()
-{
-    return data.model;
-}
-
-QString QDeviceInfoSimulatorBackend::getProductName()
-{
-    return data.productName;
-}
-
-QString QDeviceInfoSimulatorBackend::getUniqueDeviceID()
-{
-    return data.uniqueDeviceID;
-}
-
-QString QDeviceInfoSimulatorBackend::getVersion(QDeviceInfo::Version version)
-{
-    QMap<QDeviceInfo::Version, QString>::const_iterator i = data.versionList.find(version);
-    if (i != data.versionList.end())
-        return i.value();
-
-    return QString();
-}
-
-void QDeviceInfoSimulatorBackend::setFeature(QDeviceInfo::Feature feature, bool enable)
-{
-    QHash<QDeviceInfo::Feature, bool>::iterator i = data.featureList.find(feature);
-    if (i != data.featureList.end() && i.value() != enable)
-        data.featureList[feature] = enable;
-}
-
-void QDeviceInfoSimulatorBackend::setActivatedLocks(QDeviceInfo::LockTypeFlags flag)
-{
-    if (data.activatedLocks != flag) {
-        data.activatedLocks = flag;
-        emit activatedLocksChanged(flag);
-    }
-}
-
-void QDeviceInfoSimulatorBackend::setEnabledLocks(QDeviceInfo::LockTypeFlags flag)
-{
-    if (data.enabledLocks != flag) {
-        data.enabledLocks = flag;
-        emit enabledLocksChanged(flag);
-    }
-}
-
-void QDeviceInfoSimulatorBackend::setThermalState(QDeviceInfo::ThermalState state)
-{
-    if (data.currentThermalState != state) {
-        data.currentThermalState = state;
-        emit thermalStateChanged(state);
-    }
-
-}
-
-void QDeviceInfoSimulatorBackend::setImei(int num, QString imei)
-{
-    if (num >= 0 && num < data.imeiList.count()) {
-        if (data.imeiList[num] != imei)
-            data.imeiList[num] = imei;
-    }
-}
-
-void QDeviceInfoSimulatorBackend::setManufacturer(QString manufacturer)
-{
-    if (data.manufacturer != manufacturer)
-        data.manufacturer = manufacturer;
-}
-
-void QDeviceInfoSimulatorBackend::setModel(QString model)
-{
-    if (data.model != model)
-        data.model = model;
-}
-
-void QDeviceInfoSimulatorBackend::setProductName(QString name)
-{
-    if (data.productName != name)
-        data.productName = name;
-}
-
-void QDeviceInfoSimulatorBackend::setUniqueDeviceID(QString id)
-{
-    if (data.uniqueDeviceID != id)
-        data.uniqueDeviceID = id;
-}
-
-void QDeviceInfoSimulatorBackend::setVersion(QDeviceInfo::Version version, QString versionString)
-{
-    QMap<QDeviceInfo::Version, QString>::iterator i = data.versionList.find(version);
-    if (i != data.versionList.end() && i.value() != versionString)
-        data.versionList[version] = versionString;
-}
-
-// QNetworkInfoSimulatorBackend
-
-QNetworkInfoSimulatorBackend::QNetworkInfoSimulatorBackend(QNetworkInfo *parent)
-    : QObject(parent)
-{
-}
-
-QNetworkInfoSimulatorBackend::~QNetworkInfoSimulatorBackend()
-{
-}
-
-QNetworkInfoSimulatorBackend *QNetworkInfoSimulatorBackend::getSimulatorBackend()
-{
-    static QMutex mutex;
-
-    mutex.lock();
-    if (!globalSimulatorBackend)
-        globalSimulatorBackend = new QNetworkInfoSimulatorBackend();
-    mutex.unlock();
-
-    return globalSimulatorBackend;
-}
-
-QNetworkInfoData::BasicNetworkInfo *QNetworkInfoSimulatorBackend::basicNetworkInfo(QNetworkInfo::NetworkMode mode, int interface)
-{
-    QNetworkInfoData::BasicNetworkInfo *basic = 0;
-    if (interface >= 0) {
-        switch (mode) {
-        case QNetworkInfo::GsmMode:
-        case QNetworkInfo::CdmaMode:
-        case QNetworkInfo::WcdmaMode:
-        case QNetworkInfo::LteMode:
-        case QNetworkInfo::TdscdmaMode:
-            if (interface < data.cellularInfo.count())
-                basic = &(data.cellularInfo[interface].basicNetworkInfo);
-            break;
-        case QNetworkInfo::WlanMode:
-            if (interface < data.wLanInfo.count()) {
-                basic = &(data.wLanInfo[interface].basicNetworkInfo);
-            }
-            break;
-        case QNetworkInfo::EthernetMode:
-            if (interface <= data.ethernetInfo.count())
-                basic = &(data.ethernetInfo[interface].basicNetworkInfo);
-            break;
-        case QNetworkInfo::BluetoothMode:
-            if (interface <= data.bluetoothInfo.count())
-                basic = &(data.bluetoothInfo[interface].basicNetworkInfo);
-            break;
-        default:
-            break;
-        }
-    }
-    return basic;
-}
-
-bool QNetworkInfoSimulatorBackend::isValidInterface(QNetworkInfo::NetworkMode mode, int interface)
-{
-    switch (mode) {
-    case QNetworkInfo::GsmMode:
-    case QNetworkInfo::CdmaMode:
-    case QNetworkInfo::WcdmaMode:
-    case QNetworkInfo::LteMode:
-    case QNetworkInfo::TdscdmaMode:
-        if (interface >= 0 && interface < data.cellularInfo.count())
-            return true;
-        else
-            return false;
-    case QNetworkInfo::WlanMode:
-        if (interface >= 0 && interface < data.wLanInfo.count())
-            return true;
-        else
-            return false;
-    case QNetworkInfo::EthernetMode:
-        if (interface >= 0 && interface < data.ethernetInfo.count())
-            return true;
-        else
-            return false;
-    case QNetworkInfo::BluetoothMode:
-        if (interface >= 0 && interface < data.bluetoothInfo.count())
-            return true;
-        else
-            return false;
-    default:
-        break;
-    }
-    return false;
-}
-
-QNetworkInfo::NetworkMode QNetworkInfoSimulatorBackend::getCurrentNetworkMode()
-{
-    if (getNetworkStatus(QNetworkInfo::EthernetMode, 0) == QNetworkInfo::HomeNetwork)
-        return QNetworkInfo::EthernetMode;
-    else if (getNetworkStatus(QNetworkInfo::WlanMode, 0) == QNetworkInfo::HomeNetwork)
-        return QNetworkInfo::WlanMode;
-    else if (getNetworkStatus(QNetworkInfo::BluetoothMode, 0) == QNetworkInfo::HomeNetwork)
-        return QNetworkInfo::BluetoothMode;
-    else if (getNetworkStatus(QNetworkInfo::WimaxMode, 0) == QNetworkInfo::HomeNetwork)
-        return QNetworkInfo::WimaxMode;
-    else if (getNetworkStatus(QNetworkInfo::LteMode, 0) == QNetworkInfo::HomeNetwork)
-        return QNetworkInfo::LteMode;
-    else if (getNetworkStatus(QNetworkInfo::WcdmaMode, 0) == QNetworkInfo::HomeNetwork)
-        return QNetworkInfo::WcdmaMode;
-    else if (getNetworkStatus(QNetworkInfo::CdmaMode, 0) == QNetworkInfo::HomeNetwork)
-        return QNetworkInfo::CdmaMode;
-    else if (getNetworkStatus(QNetworkInfo::GsmMode, 0) == QNetworkInfo::HomeNetwork)
-        return QNetworkInfo::GsmMode;
-    else if (getNetworkStatus(QNetworkInfo::TdscdmaMode, 0) == QNetworkInfo::HomeNetwork)
-        return QNetworkInfo::TdscdmaMode;
-    else if (getNetworkStatus(QNetworkInfo::WimaxMode, 0) == QNetworkInfo::Roaming)
-        return QNetworkInfo::WimaxMode;
-    else if (getNetworkStatus(QNetworkInfo::LteMode, 0) == QNetworkInfo::Roaming)
-        return QNetworkInfo::LteMode;
-    else if (getNetworkStatus(QNetworkInfo::WcdmaMode, 0) == QNetworkInfo::Roaming)
-        return QNetworkInfo::WcdmaMode;
-    else if (getNetworkStatus(QNetworkInfo::CdmaMode, 0) == QNetworkInfo::Roaming)
-        return QNetworkInfo::CdmaMode;
-    else if (getNetworkStatus(QNetworkInfo::GsmMode, 0) == QNetworkInfo::Roaming)
-        return QNetworkInfo::GsmMode;
-    else if (getNetworkStatus(QNetworkInfo::TdscdmaMode, 0) == QNetworkInfo::Roaming)
-        return QNetworkInfo::TdscdmaMode;
-    else
-        return QNetworkInfo::UnknownMode;
-}
-
-QString QNetworkInfoSimulatorBackend::getNetworkName(QNetworkInfo::NetworkMode mode, int interface)
-{
-    if (isValidInterface(mode, interface)) {
-        QNetworkInfoData::BasicNetworkInfo *basic = basicNetworkInfo(mode, interface);
-        return basic->name;
-    }
-    return QString();
-}
-
-int QNetworkInfoSimulatorBackend::getNetworkSignalStrength(QNetworkInfo::NetworkMode mode, int interface)
-{
-    if (isValidInterface(mode, interface)) {
-        QNetworkInfoData::BasicNetworkInfo *basic = basicNetworkInfo(mode, interface);
-        return basic->signalStrength;
-    }
-    return -1;
-}
-
-QNetworkInfo::NetworkStatus QNetworkInfoSimulatorBackend::getNetworkStatus(QNetworkInfo::NetworkMode mode, int interface)
-{
-    if (isValidInterface(mode, interface)) {
-        QNetworkInfoData::BasicNetworkInfo *basic = basicNetworkInfo(mode, interface);
-        return basic->status;
-    }
-    return QNetworkInfo::UnknownStatus;
-}
-
-QNetworkInfo::NetworkMode QNetworkInfoSimulatorBackend::getMode(QNetworkInfo::NetworkMode mode, int interface)
-{
-    switch (mode) {
-    case QNetworkInfo::GsmMode:
-    case QNetworkInfo::CdmaMode:
-    case QNetworkInfo::WcdmaMode:
-    case QNetworkInfo::LteMode:
-    case QNetworkInfo::TdscdmaMode:
-        if (isValidInterface(mode, interface)) {
-            QNetworkInfoData::BasicNetworkInfo *basic = basicNetworkInfo(mode, interface);
-            return basic->mode;
-        }
-    case QNetworkInfo::WlanMode:
-        if (isValidInterface(mode, interface))
-            return QNetworkInfo::WlanMode;
-    case QNetworkInfo::EthernetMode:
-        if (isValidInterface(mode, interface))
-            return QNetworkInfo::EthernetMode;
-    case QNetworkInfo::BluetoothMode:
-        if (isValidInterface(mode, interface))
-            return QNetworkInfo::BluetoothMode;
-    default:
-        break;
-    }
-    return QNetworkInfo::UnknownMode;
-}
-
-QString QNetworkInfoSimulatorBackend::getMacAddress(QNetworkInfo::NetworkMode mode, int interface)
-{
-    if (interface >= 0) {
-        switch (mode) {
-        case QNetworkInfo::WlanMode:
-            if (isValidInterface(mode, interface))
-                return data.wLanInfo[interface].macAddress;
-            break;
-        case QNetworkInfo::EthernetMode:
-            if (isValidInterface(mode, interface))
-                return data.ethernetInfo[interface].macAddress;
-            break;
-        case QNetworkInfo::BluetoothMode:
-            if (isValidInterface(mode, interface))
-                return data.bluetoothInfo[interface].btAddress;
-            break;
-        default:
-            break;
-        }
-    }
-    return QString();
-}
-
-#ifndef QT_NO_NETWORKINTERFACE
-QNetworkInterface QNetworkInfoSimulatorBackend::getInterfaceForMode(QNetworkInfo::NetworkMode mode, int interface)
-{
-    Q_UNUSED(mode)
-    Q_UNUSED(interface)
-    return QNetworkInterface();
-}
-#endif // QT_NO_NETWORKINTERFACE
-
-QString QNetworkInfoSimulatorBackend::getImsi(int interface)
-{
-    if (isValidInterface(QNetworkInfo::GsmMode, interface))
-        return data.cellularInfo[interface].imsi;
-    else
-        return QString();
-}
-
-QString QNetworkInfoSimulatorBackend::getCellId(int interface)
-{
-    if (isValidInterface(QNetworkInfo::GsmMode, interface))
-        return data.cellularInfo[interface].cellId;
-    else
-        return QString();
-}
-
-QString QNetworkInfoSimulatorBackend::getCurrentMobileCountryCode(int interface)
-{
-    if (isValidInterface(QNetworkInfo::GsmMode, interface))
-        return data.cellularInfo[interface].currentMobileCountryCode;
-    else
-        return QString();
-}
-
-QString QNetworkInfoSimulatorBackend::getCurrentMobileNetworkCode(int interface)
-{
-    if (isValidInterface(QNetworkInfo::GsmMode, interface))
-        return data.cellularInfo[interface].currentMobileNetworkCode;
-    else
-        return QString();
-}
-
-QString QNetworkInfoSimulatorBackend::getHomeMobileCountryCode(int interface)
-{
-    if (isValidInterface(QNetworkInfo::GsmMode, interface))
-        return data.cellularInfo[interface].homeMobileCountryCode;
-    else
-        return QString();
-}
-
-QString QNetworkInfoSimulatorBackend::getHomeMobileNetworkCode(int interface)
-{
-    if (isValidInterface(QNetworkInfo::GsmMode, interface))
-        return data.cellularInfo[interface].homeMobileNetworkCode;
-    else
-        return QString();
-}
-
-QString QNetworkInfoSimulatorBackend::getLocationAreaCode(int interface)
-{
-    if (isValidInterface(QNetworkInfo::GsmMode, interface))
-        return data.cellularInfo[interface].locationAreaCode;
-    else
-        return QString();
-}
-
-QNetworkInfo::CellDataTechnology QNetworkInfoSimulatorBackend::getCurrentCellDataTechnology(int interface)
-{
-    if (isValidInterface(QNetworkInfo::GsmMode, interface))
-        return data.cellularInfo[interface].cellData;
-    else
-        return QNetworkInfo::UnknownDataTechnology;
-}
-
-int QNetworkInfoSimulatorBackend::getNetworkInterfaceCount(QNetworkInfo::NetworkMode mode)
-{
-    switch (mode) {
-    case QNetworkInfo::GsmMode:
-    case QNetworkInfo::CdmaMode:
-    case QNetworkInfo::WcdmaMode:
-    case QNetworkInfo::LteMode:
-    case QNetworkInfo::TdscdmaMode:
-        return data.cellularInfo.count();
-    case QNetworkInfo::WlanMode:
-        return data.wLanInfo.count();
-    case QNetworkInfo::EthernetMode:
-        return data.ethernetInfo.count();
-    case QNetworkInfo::BluetoothMode:
-        return data.bluetoothInfo.count();
-    default:
-        break;
-    }
-    return -1;
-}
-
-void QNetworkInfoSimulatorBackend::setImsi(int interface, const QString &id)
-{
-    if (isValidInterface(QNetworkInfo::GsmMode, interface) && (data.cellularInfo[interface].imsi != id))
-        data.cellularInfo[interface].imsi = id;
-}
-
-void QNetworkInfoSimulatorBackend::setCellId(int interface, const QString &id)
-{
-    if (isValidInterface(QNetworkInfo::GsmMode, interface) && (data.cellularInfo[interface].cellId != id)) {
-        data.cellularInfo[interface].cellId = id;
-        emit cellIdChanged(interface, id);
-    }
-}
-
-void QNetworkInfoSimulatorBackend::setLocationAreaCode(int interface, const QString &code)
-{
-    if (isValidInterface(QNetworkInfo::GsmMode, interface) && (data.cellularInfo[interface].locationAreaCode != code)) {
-        data.cellularInfo[interface].locationAreaCode = code;
-        emit locationAreaCodeChanged(interface, code);
-    }
-}
-
-void QNetworkInfoSimulatorBackend::setCurrentMobileCountryCode(int interface, const QString &code)
-{
-    if (isValidInterface(QNetworkInfo::GsmMode, interface) && (data.cellularInfo[interface].currentMobileCountryCode != code)) {
-        data.cellularInfo[interface].currentMobileCountryCode = code;
-        emit currentMobileCountryCodeChanged(interface, code);
-    }
-}
-
-void QNetworkInfoSimulatorBackend::setCurrentMobileNetworkCode(int interface, const QString &code)
-{
-    if (isValidInterface(QNetworkInfo::GsmMode, interface) && (data.cellularInfo[interface].currentMobileNetworkCode != code)) {
-        data.cellularInfo[interface].currentMobileNetworkCode = code;
-        emit currentMobileNetworkCodeChanged(interface, code);
-    }
-}
-
-void QNetworkInfoSimulatorBackend::setHomeMobileCountryCode(int interface, const QString &code)
-{
-    if (isValidInterface(QNetworkInfo::GsmMode, interface) && (data.cellularInfo[interface].homeMobileCountryCode != code))
-        data.cellularInfo[interface].homeMobileCountryCode = code;
-}
-
-void QNetworkInfoSimulatorBackend::setHomeMobileNetworkCode(int interface, const QString &code)
-{
-    if (isValidInterface(QNetworkInfo::GsmMode, interface) && (data.cellularInfo[interface].homeMobileNetworkCode != code))
-        data.cellularInfo[interface].homeMobileNetworkCode = code;
-}
-
-void QNetworkInfoSimulatorBackend::setCellDataTechnology(int interface, QNetworkInfo::CellDataTechnology cellData)
-{
-    if (isValidInterface(QNetworkInfo::GsmMode, interface) && (data.cellularInfo[interface].cellData != cellData)) {
-        data.cellularInfo[interface].cellData = cellData;
-        emit currentCellDataTechnologyChanged(interface, cellData);
-    }
-}
-
-void QNetworkInfoSimulatorBackend::setMode(int interface, QNetworkInfo::NetworkMode mode)
-{
-    switch (mode) {
-    case QNetworkInfo::GsmMode:
-    case QNetworkInfo::CdmaMode:
-    case QNetworkInfo::WcdmaMode:
-    case QNetworkInfo::LteMode:
-    case QNetworkInfo::TdscdmaMode:
-        if (isValidInterface(mode, interface) && (data.cellularInfo[interface].basicNetworkInfo.mode != mode))
-            data.cellularInfo[interface].basicNetworkInfo.mode = mode;
-    default:
-        break;
-    }
-}
-
-void QNetworkInfoSimulatorBackend::setNetworkName(QNetworkInfo::NetworkMode mode, int interface, const QString &name)
-{
-    if (isValidInterface(mode, interface)) {
-        QNetworkInfoData::BasicNetworkInfo *basic = basicNetworkInfo(mode, interface);
-        if (basic != 0 && basic->name != name) {
-            basic->name = name;
-            emit networkNameChanged(mode, interface, name);
-        }
-    }
-}
-
-void QNetworkInfoSimulatorBackend::setNetworkMacAddress(QNetworkInfo::NetworkMode mode, int interface, const QString &mac)
-{
-    if (interface >= 0) {
-        switch (mode) {
-        case QNetworkInfo::WlanMode:
-            if (isValidInterface(mode, interface))
-                data.wLanInfo[interface].macAddress = mac;
-            break;
-        case QNetworkInfo::EthernetMode:
-            if (isValidInterface(mode, interface))
-                data.ethernetInfo[interface].macAddress = mac;
-            break;
-        case QNetworkInfo::BluetoothMode:
-            if (isValidInterface(mode, interface))
-                data.bluetoothInfo[interface].btAddress = mac;
-            break;
-        default:
-            break;
-        }
-    }
-}
-
-void QNetworkInfoSimulatorBackend::setNetworkSignalStrength(QNetworkInfo::NetworkMode mode, int interface, int strength)
-{
-    if (isValidInterface(mode, interface)) {
-        QNetworkInfoData::BasicNetworkInfo* basic = basicNetworkInfo(mode, interface);
-        if (basic != 0 && basic->signalStrength != strength) {
-            basic->signalStrength = strength;
-            emit networkSignalStrengthChanged(mode, interface, strength);
-        }
-    }
-}
-
-void QNetworkInfoSimulatorBackend::setNetworkStatus(QNetworkInfo::NetworkMode mode, int interface, QNetworkInfo::NetworkStatus status)
-{
-    if (isValidInterface(mode, interface)) {
-        QNetworkInfoData::BasicNetworkInfo* basic = basicNetworkInfo(mode, interface);
-        if (basic != 0 && basic->status != status) {
-            basic->status = status;
-            emit networkStatusChanged(mode, interface, status);
-        }
-    }
-}
-
-void QNetworkInfoSimulatorBackend::addEthernetInterface(QNetworkInfoData::EthernetInfo info)
-{
-    data.ethernetInfo.append(info);
-    emit networkInterfaceCountChanged(info.basicNetworkInfo.mode, getNetworkInterfaceCount(info.basicNetworkInfo.mode));
-}
-
-void QNetworkInfoSimulatorBackend::addWlanInterface(QNetworkInfoData::WLanInfo info)
-{
-    data.wLanInfo.append(info);
-    emit networkInterfaceCountChanged(info.basicNetworkInfo.mode, getNetworkInterfaceCount(info.basicNetworkInfo.mode));
-}
-
-void QNetworkInfoSimulatorBackend::addCellularInterface(QNetworkInfoData::CellularInfo info)
-{
-    data.cellularInfo.append(info);
-    emit networkInterfaceCountChanged(info.basicNetworkInfo.mode, getNetworkInterfaceCount(info.basicNetworkInfo.mode));
-}
-
-void QNetworkInfoSimulatorBackend::addBluetoothInterface(QNetworkInfoData::BluetoothInfo info)
-{
-    data.bluetoothInfo.append(info);
-    emit networkInterfaceCountChanged(info.basicNetworkInfo.mode, getNetworkInterfaceCount(info.basicNetworkInfo.mode));
-}
-
-void QNetworkInfoSimulatorBackend::removeInterface(QNetworkInfo::NetworkMode mode, int interface)
-{
-    clearOrRemoveInterface(mode, interface, false);
-}
-
-void QNetworkInfoSimulatorBackend::clearInterface(QNetworkInfo::NetworkMode mode)
-{
-    clearOrRemoveInterface(mode, 0, true);
-}
-
-void QNetworkInfoSimulatorBackend::clearOrRemoveInterface(QNetworkInfo::NetworkMode mode, int interface, bool clear)
-{
-    switch (mode) {
-    case QNetworkInfo::GsmMode:
-    case QNetworkInfo::CdmaMode:
-    case QNetworkInfo::WcdmaMode:
-    case QNetworkInfo::LteMode:
-    case QNetworkInfo::TdscdmaMode:
-        if (isValidInterface(mode, interface)) {
-            clear ? data.cellularInfo.clear() : data.cellularInfo.remove(interface);
-            emit networkInterfaceCountChanged(mode, getNetworkInterfaceCount(mode));
-        }
-        break;
-    case QNetworkInfo::WlanMode:
-        if (isValidInterface(mode, interface)) {
-            clear ? data.wLanInfo.clear() : data.wLanInfo.remove(interface);
-            emit networkInterfaceCountChanged(mode, getNetworkInterfaceCount(mode));
-        }
-        break;
-    case QNetworkInfo::EthernetMode:
-        if (isValidInterface(mode, interface)) {
-            clear ? data.ethernetInfo.clear() : data.ethernetInfo.remove(interface);
-            emit networkInterfaceCountChanged(mode, getNetworkInterfaceCount(mode));
-        }
-        break;
-    case QNetworkInfo::BluetoothMode:
-        if (isValidInterface(mode, interface)) {
-            clear ? data.bluetoothInfo.clear() : data.bluetoothInfo.remove(interface);
-            emit networkInterfaceCountChanged(mode, getNetworkInterfaceCount(mode));
-        }
-        break;
-    default:
-        break;
-    }
-}
-
 QT_END_NAMESPACE
diff --git a/src/systeminfo/simulator/qsysteminfobackend_simulator_p.h b/src/systeminfo/simulator/qsysteminfobackend_simulator_p.h
index 94d9b3a3..489adf33 100644
--- a/src/systeminfo/simulator/qsysteminfobackend_simulator_p.h
+++ b/src/systeminfo/simulator/qsysteminfobackend_simulator_p.h
@@ -113,133 +113,6 @@ private:
     QBatteryInfoData data;
 };
 
-
-// QDeviceInfoSimulatorBackend
-
-class Q_SYSTEMINFO_EXPORT QDeviceInfoSimulatorBackend : public QObject
-{
-    Q_OBJECT
-
-private:
-    QDeviceInfoSimulatorBackend(QObject *parent = 0);
-    Q_DISABLE_COPY(QDeviceInfoSimulatorBackend)
-
-public:
-    ~QDeviceInfoSimulatorBackend();
-    static QDeviceInfoSimulatorBackend *getSimulatorBackend();
-
-    bool hasFeature(QDeviceInfo::Feature);
-    int getImeiCount();
-    QDeviceInfo::LockTypeFlags getActivatedLocks();
-    QDeviceInfo::LockTypeFlags getEnabledLocks();
-    QDeviceInfo::ThermalState getThermalState();
-    QString getImei(int num);
-    QString getManufacturer();
-    QString getModel();
-    QString getProductName();
-    QString getUniqueDeviceID();
-    QString getVersion(QDeviceInfo::Version);
-
-    void setFeature(QDeviceInfo::Feature feature, bool enable);
-    void setActivatedLocks(QDeviceInfo::LockTypeFlags flag);
-    void setEnabledLocks(QDeviceInfo::LockTypeFlags flag);
-    void setThermalState(QDeviceInfo::ThermalState state);
-    void setImei(int num, QString imei);
-    void setManufacturer(QString manufacturer);
-    void setModel(QString model);
-    void setProductName(QString name);
-    void setUniqueDeviceID(QString id);
-    void setVersion(QDeviceInfo::Version version, QString versionString);
-
-Q_SIGNALS:
-    void activatedLocksChanged(QDeviceInfo::LockTypeFlags);
-    void enabledLocksChanged(QDeviceInfo::LockTypeFlags);
-    void thermalStateChanged(QDeviceInfo::ThermalState);
-
-private:
-    QDeviceInfoData data;
-    static QDeviceInfoSimulatorBackend *globalSimulatorBackend;
-
-    void initFeatureList();
-    void initImeiList();
-    void initVersionList();
-};
-
-// QNetworkInfoSimulatorBackend
-
-class Q_SYSTEMINFO_EXPORT QNetworkInfoSimulatorBackend : public QObject
-{
-    Q_OBJECT
-
-private:
-    QNetworkInfoSimulatorBackend(QNetworkInfo *parent = 0);
-    Q_DISABLE_COPY(QNetworkInfoSimulatorBackend)
-
-public:
-    ~QNetworkInfoSimulatorBackend();
-    static QNetworkInfoSimulatorBackend *getSimulatorBackend();
-
-    int getNetworkInterfaceCount(QNetworkInfo::NetworkMode mode);
-    int getNetworkSignalStrength(QNetworkInfo::NetworkMode mode, int interface);
-    QNetworkInfo::CellDataTechnology getCurrentCellDataTechnology(int interface);
-    QNetworkInfo::NetworkMode getCurrentNetworkMode();
-    QString getImsi(int interface);
-    QNetworkInfo::NetworkStatus getNetworkStatus(QNetworkInfo::NetworkMode mode, int interface);
-#ifndef QT_NO_NETWORKINTERFACE
-    QNetworkInterface getInterfaceForMode(QNetworkInfo::NetworkMode mode, int interface);
-#endif // QT_NO_NETWORKINTERFACE
-    QString getCellId(int interface);
-    QString getCurrentMobileCountryCode(int interface);
-    QString getCurrentMobileNetworkCode(int interface);
-    QString getHomeMobileCountryCode(int interface);
-    QString getHomeMobileNetworkCode(int interface);
-    QString getLocationAreaCode(int interface);
-    QString getMacAddress(QNetworkInfo::NetworkMode mode, int interface);
-    QString getNetworkName(QNetworkInfo::NetworkMode mode, int interface);
-    QNetworkInfo::NetworkMode getMode(QNetworkInfo::NetworkMode mode, int interface);
-
-    void setImsi(int interface, const QString &id);
-    void setCellId(int interface, const QString &id);
-    void setLocationAreaCode(int interface, const QString &code);
-    void setCurrentMobileCountryCode( int interface, const QString &code);
-    void setCurrentMobileNetworkCode(int interface, const QString &code);
-    void setHomeMobileCountryCode(int interface, const QString &code);
-    void setHomeMobileNetworkCode(int interface, const QString &code);
-    void setCellDataTechnology(int interface, QNetworkInfo::CellDataTechnology cellData);
-    void setMode(int interface, QNetworkInfo::NetworkMode mode);
-    void setNetworkName(QNetworkInfo::NetworkMode mode, int interface, const QString &name);
-    void setNetworkMacAddress(QNetworkInfo::NetworkMode mode, int interface, const QString &mac);
-    void setNetworkSignalStrength(QNetworkInfo::NetworkMode mode, int interface, int strength);
-    void setNetworkStatus(QNetworkInfo::NetworkMode mode, int interface, QNetworkInfo::NetworkStatus status);
-
-    void addEthernetInterface(QNetworkInfoData::EthernetInfo info);
-    void addWlanInterface(QNetworkInfoData::WLanInfo info);
-    void addCellularInterface(QNetworkInfoData::CellularInfo info);
-    void addBluetoothInterface(QNetworkInfoData::BluetoothInfo info);
-    void removeInterface(QNetworkInfo::NetworkMode mode, int interface);
-    void clearInterface(QNetworkInfo::NetworkMode mode);
-
-Q_SIGNALS:
-    void cellIdChanged(int interface, const QString &id);
-    void currentCellDataTechnologyChanged(int interface, QNetworkInfo::CellDataTechnology tech);
-    void currentMobileCountryCodeChanged(int interface, const QString &mcc);
-    void currentMobileNetworkCodeChanged(int interface, const QString &mnc);
-    void currentNetworkModeChanged(QNetworkInfo::NetworkMode mode);
-    void locationAreaCodeChanged(int interface, const QString &lac);
-    void networkInterfaceCountChanged(QNetworkInfo::NetworkMode mode, int count);
-    void networkNameChanged(QNetworkInfo::NetworkMode mode, int interface, const QString &name);
-    void networkSignalStrengthChanged(QNetworkInfo::NetworkMode mode, int interface, int strength);
-    void networkStatusChanged(QNetworkInfo::NetworkMode mode, int interface, QNetworkInfo::NetworkStatus status);
-
-private:
-    static QNetworkInfoSimulatorBackend *globalSimulatorBackend;
-    QNetworkInfoData data;
-
-    QNetworkInfoData::BasicNetworkInfo *basicNetworkInfo(QNetworkInfo::NetworkMode mode, int interface);
-    bool isValidInterface(QNetworkInfo::NetworkMode mode, int interface);
-    void clearOrRemoveInterface(QNetworkInfo::NetworkMode mode, int interface, bool clear);
-};
-
 QT_END_NAMESPACE
 
 #endif // QSYSTEMINFOBACKEND_SIMULATOR_P_H
diff --git a/src/systeminfo/simulator/qsysteminfoconnection_simulator.cpp b/src/systeminfo/simulator/qsysteminfoconnection_simulator.cpp
index db3ebe0c..51db00bf 100644
--- a/src/systeminfo/simulator/qsysteminfoconnection_simulator.cpp
+++ b/src/systeminfo/simulator/qsysteminfoconnection_simulator.cpp
@@ -112,153 +112,4 @@ void SystemInfoConnection::setBatteryInfoData(const QBatteryInfoData &data)
     batteryInfoBackend->setTemperature(data.temperature);
 }
 
-void SystemInfoConnection::setDeviceInfoData(const QDeviceInfoData &data)
-{
-    QDeviceInfoSimulatorBackend *deviceInfoBackend = QDeviceInfoSimulatorBackend::getSimulatorBackend();
-
-    deviceInfoBackend->setManufacturer(data.manufacturer);
-    deviceInfoBackend->setModel(data.model);
-    deviceInfoBackend->setProductName(data.productName);
-    deviceInfoBackend->setActivatedLocks(data.activatedLocks);
-    deviceInfoBackend->setEnabledLocks(data.enabledLocks);
-    deviceInfoBackend->setUniqueDeviceID(data.uniqueDeviceID);
-    deviceInfoBackend->setThermalState(data.currentThermalState);
-    deviceInfoBackend->setVersion(QDeviceInfo::Os, data.versionList.value(QDeviceInfo::Os));
-    deviceInfoBackend->setVersion(QDeviceInfo::Firmware, data.versionList.value(QDeviceInfo::Firmware));
-
-    int imeiCount = deviceInfoBackend->getImeiCount();
-    int receivedImeiCount = data.imeiList.count();
-    if (imeiCount > receivedImeiCount) {
-        int imeiIndex;
-        for (imeiIndex = 0; imeiIndex < imeiCount; imeiIndex++)
-            deviceInfoBackend->setImei(imeiIndex, QStringLiteral(""));
-        for (imeiIndex = 0; imeiIndex < receivedImeiCount; imeiIndex++)
-            deviceInfoBackend->setImei(imeiIndex, data.imeiList.value(imeiIndex));
-    } else {
-        for (int imeiIndex = 0; imeiIndex < imeiCount; imeiIndex++)
-            deviceInfoBackend->setImei(imeiIndex, data.imeiList.value(imeiIndex));
-    }
-
-    QList<QDeviceInfo::Feature> featureKeys = data.featureList.keys();
-    foreach (const QDeviceInfo::Feature &featureKey, featureKeys)
-        deviceInfoBackend->setFeature(featureKey, data.featureList.value(featureKey));
-}
-
-void SystemInfoConnection::setNetworkInfoData(const QNetworkInfoData &data)
-{
-    QNetworkInfoSimulatorBackend *networkInfoBackend = QNetworkInfoSimulatorBackend::getSimulatorBackend();
-
-    int actualCount = networkInfoBackend->getNetworkInterfaceCount(QNetworkInfo::WlanMode);
-    int newCount = data.wLanInfo.count();
-
-    if (newCount < actualCount) {
-        for (int i = actualCount; i > newCount; i--)
-            networkInfoBackend->removeInterface(QNetworkInfo::WlanMode, i - 1);
-    } else if (newCount > actualCount) {
-        for (int i = actualCount; i < newCount; i++) {
-            QNetworkInfoData::WLanInfo info = {{QString(),
-                                               -1,
-                                               QNetworkInfo::WlanMode,
-                                               QNetworkInfo::UnknownStatus},
-                                               QString()};
-            networkInfoBackend->addWlanInterface(info);
-        }
-    }
-
-#if defined(QT_NO_OFONO)
-    actualCount = networkInfoBackend->getNetworkInterfaceCount(QNetworkInfo::EthernetMode);
-    newCount = data.ethernetInfo.count();
-    if (newCount < actualCount) {
-        for (int i = actualCount; i > newCount; i--)
-            networkInfoBackend->removeInterface(QNetworkInfo::EthernetMode, i - 1);
-    } else if (newCount > actualCount) {
-        for (int i = actualCount; i < newCount; i++) {
-            QNetworkInfoData::EthernetInfo info = {{QString(),
-                                                   -1,
-                                                   QNetworkInfo::EthernetMode,
-                                                   QNetworkInfo::UnknownStatus},
-                                                   QString()};
-            networkInfoBackend->addEthernetInterface(info);
-        }
-    }
-
-    actualCount = networkInfoBackend->getNetworkInterfaceCount(QNetworkInfo::BluetoothMode);
-    newCount = data.bluetoothInfo.count();
-    if (newCount < actualCount) {
-        for (int i = actualCount; i > newCount; i--)
-            networkInfoBackend->removeInterface(QNetworkInfo::BluetoothMode, i - 1);
-    } else if (newCount > actualCount) {
-        for (int i = actualCount; i < newCount; i++) {
-            QNetworkInfoData::BluetoothInfo info = {{QString(),
-                                                    -1,
-                                                    QNetworkInfo::BluetoothMode,
-                                                    QNetworkInfo::UnknownStatus},
-                                                    QString()};
-            networkInfoBackend->addBluetoothInterface(info);
-        }
-    }
-
-    actualCount = networkInfoBackend->getNetworkInterfaceCount(QNetworkInfo::GsmMode);
-    newCount = data.cellularInfo.count();
-    if (newCount < actualCount) {
-        for (int i = actualCount; i > newCount; i--)
-            networkInfoBackend->removeInterface(QNetworkInfo::GsmMode, i - 1);
-    } else if (newCount > actualCount) {
-        for (int i = actualCount; i < newCount; i++) {
-            QNetworkInfoData::CellularInfo info = {{QString(),
-                                                   -1,
-                                                   QNetworkInfo::GsmMode,
-                                                   QNetworkInfo::UnknownStatus},
-                                                   QString(),
-                                                   QString(),
-                                                   QString(),
-                                                   QString(),
-                                                   QString(),
-                                                   QString(),
-                                                   QString(),
-                                                   QNetworkInfo::UnknownDataTechnology};
-            networkInfoBackend->addCellularInterface(info);
-        }
-    }
-#endif
-
-    for (int i = 0; i < data.wLanInfo.count(); i++) {
-        networkInfoBackend->setNetworkName(QNetworkInfo::WlanMode, i, data.wLanInfo[i].basicNetworkInfo.name);
-        networkInfoBackend->setNetworkSignalStrength(QNetworkInfo::WlanMode, i, data.wLanInfo[i].basicNetworkInfo.signalStrength);
-        networkInfoBackend->setNetworkStatus(QNetworkInfo::WlanMode, i, data.wLanInfo[i].basicNetworkInfo.status);
-        networkInfoBackend->setNetworkMacAddress(QNetworkInfo::WlanMode, i, data.wLanInfo[i].macAddress);
-    }
-
-#if defined(QT_NO_OFONO)
-    for (int i = 0; i < data.ethernetInfo.count(); i++) {
-        networkInfoBackend->setNetworkName(QNetworkInfo::EthernetMode, i, data.ethernetInfo[i].basicNetworkInfo.name);
-        networkInfoBackend->setNetworkSignalStrength(QNetworkInfo::EthernetMode, i, data.ethernetInfo[i].basicNetworkInfo.signalStrength);
-        networkInfoBackend->setNetworkStatus(QNetworkInfo::EthernetMode, i, data.ethernetInfo[i].basicNetworkInfo.status);
-        networkInfoBackend->setNetworkMacAddress(QNetworkInfo::EthernetMode, i, data.ethernetInfo[i].macAddress);
-    }
-
-    for (int i = 0; i < data.bluetoothInfo.count(); i++) {
-        networkInfoBackend->setNetworkName(QNetworkInfo::BluetoothMode, i, data.bluetoothInfo[i].basicNetworkInfo.name);
-        networkInfoBackend->setNetworkSignalStrength(QNetworkInfo::BluetoothMode, i, data.bluetoothInfo[i].basicNetworkInfo.signalStrength);
-        networkInfoBackend->setNetworkStatus(QNetworkInfo::BluetoothMode, i, data.bluetoothInfo[i].basicNetworkInfo.status);
-        networkInfoBackend->setNetworkMacAddress(QNetworkInfo::BluetoothMode, i, data.bluetoothInfo[i].btAddress);
-    }
-
-    for (int i = 0; i < data.cellularInfo.count(); i++) {
-        networkInfoBackend->setNetworkName(data.cellularInfo[i].basicNetworkInfo.mode, i, data.cellularInfo[i].basicNetworkInfo.name);
-        networkInfoBackend->setNetworkSignalStrength(data.cellularInfo[i].basicNetworkInfo.mode, i, data.cellularInfo[i].basicNetworkInfo.signalStrength);
-        networkInfoBackend->setMode(i, data.cellularInfo[i].basicNetworkInfo.mode);
-        networkInfoBackend->setNetworkStatus(data.cellularInfo[i].basicNetworkInfo.mode, i, data.cellularInfo[i].basicNetworkInfo.status);
-        networkInfoBackend->setImsi(i, data.cellularInfo[i].imsi);
-        networkInfoBackend->setCellId(i, data.cellularInfo[i].cellId);
-        networkInfoBackend->setLocationAreaCode(i, data.cellularInfo[i].locationAreaCode);
-        networkInfoBackend->setCurrentMobileCountryCode(i, data.cellularInfo[i].currentMobileCountryCode);
-        networkInfoBackend->setCurrentMobileNetworkCode(i, data.cellularInfo[i].currentMobileNetworkCode);
-        networkInfoBackend->setHomeMobileCountryCode(i, data.cellularInfo[i].homeMobileCountryCode);
-        networkInfoBackend->setHomeMobileNetworkCode(i, data.cellularInfo[i].homeMobileNetworkCode);
-        networkInfoBackend->setCellDataTechnology(i, data.cellularInfo[i].cellData);
-    }
-#endif
-}
-
 QT_END_NAMESPACE
diff --git a/src/systeminfo/simulator/qsysteminfoconnection_simulator_p.h b/src/systeminfo/simulator/qsysteminfoconnection_simulator_p.h
index 4d263533..e7f902ba 100644
--- a/src/systeminfo/simulator/qsysteminfoconnection_simulator_p.h
+++ b/src/systeminfo/simulator/qsysteminfoconnection_simulator_p.h
@@ -74,8 +74,6 @@ private:
 private Q_SLOTS:
     void initialSystemInfoDataSent();
     void setBatteryInfoData(const QBatteryInfoData &data);
-    void setDeviceInfoData(const QDeviceInfoData &data);
-    void setNetworkInfoData(const QNetworkInfoData &data);
 
 Q_SIGNALS:
     void initialDataReceived();
diff --git a/src/systeminfo/simulator/qsysteminfodata_simulator.cpp b/src/systeminfo/simulator/qsysteminfodata_simulator.cpp
index 1b8cc723..440777a1 100644
--- a/src/systeminfo/simulator/qsysteminfodata_simulator.cpp
+++ b/src/systeminfo/simulator/qsysteminfodata_simulator.cpp
@@ -39,180 +39,7 @@ QT_BEGIN_NAMESPACE
 
 void qt_registerSystemInfoTypes()
 {
-    qRegisterMetaTypeStreamOperators<QNetworkInfoData>("QNetworkInfoData");
-    qRegisterMetaTypeStreamOperators<QNetworkInfoData::BasicNetworkInfo>("QNetworkInfoData::BasicNetworkInfo");
-    qRegisterMetaTypeStreamOperators<QNetworkInfoData::EthernetInfo>("QNetworkInfoData::EthernetInfo");
-    qRegisterMetaTypeStreamOperators<QNetworkInfoData::WLanInfo>("QNetworkInfoData::WLanInfo");
-    qRegisterMetaTypeStreamOperators<QNetworkInfoData::CellularInfo>("QNetworkInfoData::CellularInfo");
-    qRegisterMetaTypeStreamOperators<QNetworkInfoData::BluetoothInfo>("QNetworkInfoData::BluetoothInfo");
-    qRegisterMetaTypeStreamOperators<QDeviceInfoData>("QDeviceInfoData");
     qRegisterMetaTypeStreamOperators<QBatteryInfoData>("QBatteryInfoData");
-    qRegisterMetaTypeStreamOperators<QScreenSaverData>("QScreenSaverData");
-}
-
-QDataStream &operator<<(QDataStream &out, const QNetworkInfoData::BasicNetworkInfo &s)
-{
-    out << s.name;
-    out << static_cast<qint32>(s.signalStrength) << static_cast<qint32>(s.mode)
-        << static_cast<qint32>(s.status);
-    return out;
-}
-
-QDataStream &operator>>(QDataStream &in, QNetworkInfoData::BasicNetworkInfo &s)
-{
-    in >> s.name;
-    qint32 signalStrength;
-    in >> signalStrength;
-    s.signalStrength = signalStrength;
-    qint32 mode, status;
-    in >> mode;
-    in >> status;
-    s.mode = static_cast<QNetworkInfo::NetworkMode>(mode);
-    s.status = static_cast<QNetworkInfo::NetworkStatus>(status);
-    return in;
-}
-
-QDataStream &operator<<(QDataStream &out, const QNetworkInfoData::EthernetInfo &s)
-{
-    out << s.basicNetworkInfo;
-    out << s.macAddress;
-
-    return out;
-}
-
-QDataStream &operator>>(QDataStream &in, QNetworkInfoData::EthernetInfo &s)
-{
-    in >> s.basicNetworkInfo;
-    in >> s.macAddress;
-
-    return in;
-}
-
-QDataStream &operator<<(QDataStream &out, const QNetworkInfoData::WLanInfo &s)
-{
-    out << s.basicNetworkInfo;
-    out << s.macAddress;
-    return out;
-}
-
-QDataStream &operator>>(QDataStream &in, QNetworkInfoData::WLanInfo &s)
-{
-    in >> s.basicNetworkInfo;
-    in >> s.macAddress;
-    return in;
-}
-
-QDataStream &operator<<(QDataStream &out, const QNetworkInfoData::BluetoothInfo &s)
-{
-    out << s.basicNetworkInfo;
-    out << s.btAddress;
-    return out;
-}
-
-QDataStream &operator>>(QDataStream &in, QNetworkInfoData::BluetoothInfo &s)
-{
-    in >> s.basicNetworkInfo;
-    in >> s.btAddress;
-    return in;
-}
-
-QDataStream &operator<<(QDataStream &out, const QNetworkInfoData::CellularInfo &s)
-{
-    out << s.basicNetworkInfo;
-    out << s.imsi << s.cellId << s.locationAreaCode;
-    out << s.currentMobileCountryCode << s.currentMobileNetworkCode;
-    out << s.homeMobileCountryCode << s.homeMobileNetworkCode;
-    out << static_cast<qint32>(s.cellData);
-
-    return out;
-}
-
-QDataStream &operator>>(QDataStream &in, QNetworkInfoData::CellularInfo &s)
-{
-    in >> s.basicNetworkInfo;
-    qint32 cellData;
-    in >> s.imsi >> s.cellId >> s.locationAreaCode;
-    in >> s.currentMobileCountryCode >> s.currentMobileNetworkCode;
-    in >> s.homeMobileCountryCode >> s.homeMobileNetworkCode;
-    in >> cellData;
-    s.cellData = static_cast<QNetworkInfo::CellDataTechnology>(cellData);
-
-    return in;
-}
-
-QDataStream &operator<<(QDataStream &out, const QNetworkInfoData &s)
-{
-    out << s.ethernetInfo;
-    out << s.wLanInfo;
-    out << s.cellularInfo;
-    out << s.bluetoothInfo;
-
-    return out;
-}
-
-QDataStream &operator>>(QDataStream &in, QNetworkInfoData &s)
-{
-    in >> s.ethernetInfo;
-    in >> s.wLanInfo;
-    in >> s.cellularInfo;
-    in >> s.bluetoothInfo;
-
-    return in;
-}
-
-QDataStream &operator<<(QDataStream &out, const QDeviceInfoData &s)
-{
-    out << s.manufacturer << s.model << s.productName << s.uniqueDeviceID;
-    out << s.imeiList;
-    out << s.featureList;
-    out << s.versionList;
-    out << static_cast<qint32>(s.enabledLocks) << static_cast<qint32>(s.activatedLocks)
-        << static_cast<qint32>(s.currentThermalState);
-
-    return out;
-}
-
-QDataStream &operator>>(QDataStream &in, QDeviceInfoData &s)
-{
-    in >> s.manufacturer >> s.model >> s.productName >> s.uniqueDeviceID;
-    in >> s.imeiList;
-    in >> s.featureList;
-    in >> s.versionList;
-    qint32 enabledLocks, activatedLocks, currentThermalState;
-    in >> enabledLocks >> activatedLocks >> currentThermalState;
-    s.enabledLocks = static_cast<QDeviceInfo::LockTypeFlags>(enabledLocks);
-    s.activatedLocks = static_cast<QDeviceInfo::LockTypeFlags>(activatedLocks);
-    s.currentThermalState = static_cast<QDeviceInfo::ThermalState>(currentThermalState);
-
-    return in;
-}
-
-QDataStream &operator<<(QDataStream &out, const QDeviceInfo::Feature s)
-{
-    out << static_cast<qint32>(s);
-    return out;
-}
-
-QDataStream &operator>>(QDataStream &in, QDeviceInfo::Feature &s)
-{
-    qint32 v;
-    in >> v;
-    s = static_cast<QDeviceInfo::Feature>(v);
-    return in;
-}
-
-QDataStream &operator<<(QDataStream &out, const QDeviceInfo::Version s)
-{
-    out << static_cast<qint32>(s);
-    return out;
-}
-
-QDataStream &operator>>(QDataStream &in, QDeviceInfo::Version &s)
-{
-    qint32 v;
-    in >> v;
-    s = static_cast<QDeviceInfo::Version>(v);
-    return in;
 }
 
 QDataStream &operator<<(QDataStream &out, const QBatteryInfoData &s)
@@ -248,18 +75,6 @@ QDataStream &operator>>(QDataStream &in, QBatteryInfoData &s)
     return in;
 }
 
-QDataStream &operator<<(QDataStream &out, const QScreenSaverData &s)
-{
-    out << s.screenSaverEnabled;
-    return out;
-}
-
-QDataStream &operator>>(QDataStream &in, QScreenSaverData &s)
-{
-    in >> s.screenSaverEnabled;
-    return in;
-}
-
 QT_END_NAMESPACE
 
 
diff --git a/src/systeminfo/simulator/qsysteminfodata_simulator_p.h b/src/systeminfo/simulator/qsysteminfodata_simulator_p.h
index c0b8ce46..da9065fc 100644
--- a/src/systeminfo/simulator/qsysteminfodata_simulator_p.h
+++ b/src/systeminfo/simulator/qsysteminfodata_simulator_p.h
@@ -47,64 +47,12 @@
 // We mean it.
 //
 
-#include <qnetworkinfo.h>
-#include <qdeviceinfo.h>
 #include <qbatteryinfo.h>
-#include <qscreensaver.h>
 
-#include <QHash>
-#include <QVector>
-#include <QString>
 #include <QMetaType>
 
 QT_BEGIN_NAMESPACE
 
-struct QNetworkInfoData
-{
-    struct BasicNetworkInfo {
-        QString name;
-        int signalStrength;
-        QNetworkInfo::NetworkMode mode;
-        QNetworkInfo::NetworkStatus status;
-    };
-
-    struct EthernetInfo
-    {
-        BasicNetworkInfo basicNetworkInfo;
-        QString macAddress;
-    };
-
-    struct WLanInfo
-    {
-        BasicNetworkInfo basicNetworkInfo;
-        QString macAddress;
-    };
-
-    struct CellularInfo {
-        BasicNetworkInfo basicNetworkInfo;
-
-        QString imsi;
-        QString cellId;
-        QString locationAreaCode;
-
-        QString currentMobileCountryCode;
-        QString currentMobileNetworkCode;
-        QString homeMobileCountryCode;
-        QString homeMobileNetworkCode;
-        QNetworkInfo::CellDataTechnology cellData;
-    };
-
-    struct BluetoothInfo {
-        BasicNetworkInfo basicNetworkInfo;
-        QString btAddress;
-    };
-
-    QVector<EthernetInfo> ethernetInfo;
-    QVector<WLanInfo> wLanInfo;
-    QVector<CellularInfo> cellularInfo;
-    QVector<BluetoothInfo> bluetoothInfo;
-};
-
 struct QBatteryInfoData
 {
     int index;
@@ -122,57 +70,12 @@ struct QBatteryInfoData
     float temperature;
 };
 
-struct QDeviceInfoData
-{
-    QString manufacturer;
-    QString model;
-    QString productName;
-    QString uniqueDeviceID;
-
-    QDeviceInfo::LockTypeFlags enabledLocks;
-    QDeviceInfo::LockTypeFlags activatedLocks;
-    QDeviceInfo::ThermalState currentThermalState;
-
-    QHash<QDeviceInfo::Feature, bool> featureList;
-    QList<QString> imeiList;
-    QMap<QDeviceInfo::Version, QString> versionList;
-};
-
-struct QScreenSaverData
-{
-    bool screenSaverEnabled;
-};
-
-
-Q_DECLARE_METATYPE(QNetworkInfoData)
-Q_DECLARE_METATYPE(QDeviceInfoData)
 Q_DECLARE_METATYPE(QBatteryInfoData)
-Q_DECLARE_METATYPE(QScreenSaverData)
 
 void qt_registerSystemInfoTypes();
 
-QDataStream &operator<<(QDataStream &out, const QNetworkInfoData::BasicNetworkInfo &s);
-QDataStream &operator>>(QDataStream &in, QNetworkInfoData::BasicNetworkInfo &s);
-QDataStream &operator<<(QDataStream &out, const QNetworkInfoData::EthernetInfo &s);
-QDataStream &operator>>(QDataStream &in, QNetworkInfoData::EthernetInfo &s);
-QDataStream &operator<<(QDataStream &out, const QNetworkInfoData::WLanInfo &s);
-QDataStream &operator>>(QDataStream &in, QNetworkInfoData::WLanInfo &s);
-QDataStream &operator<<(QDataStream &out, const QNetworkInfoData::BluetoothInfo &s);
-QDataStream &operator>>(QDataStream &in, QNetworkInfoData::BluetoothInfo &s);
-QDataStream &operator<<(QDataStream &out, const QNetworkInfoData::CellularInfo &s);
-QDataStream &operator>>(QDataStream &in, QNetworkInfoData::CellularInfo &s);
-QDataStream &operator<<(QDataStream &out, const QNetworkInfoData &s);
-QDataStream &operator>>(QDataStream &in, QNetworkInfoData &s);
-QDataStream &operator<<(QDataStream &out, const QDeviceInfoData &s);
-QDataStream &operator>>(QDataStream &in, QDeviceInfoData &s);
-QDataStream &operator<<(QDataStream &out, const QDeviceInfo::Feature s);
-QDataStream &operator>>(QDataStream &in, QDeviceInfo::Feature &s);
-QDataStream &operator<<(QDataStream &out, const QDeviceInfo::Version s);
-QDataStream &operator>>(QDataStream &in, QDeviceInfo::Version &s);
 QDataStream &operator<<(QDataStream &out, const QBatteryInfoData &s);
 QDataStream &operator>>(QDataStream &in, QBatteryInfoData &s);
-QDataStream &operator<<(QDataStream &out, const QScreenSaverData &s);
-QDataStream &operator>>(QDataStream &in, QScreenSaverData &s);
 
 QT_END_NAMESPACE
 
diff --git a/src/systeminfo/systeminfo.pro b/src/systeminfo/systeminfo.pro
index 6961f2d1..395b8d8b 100644
--- a/src/systeminfo/systeminfo.pro
+++ b/src/systeminfo/systeminfo.pro
@@ -190,16 +190,25 @@ simulator {
     QT_PRIVATE += simulator
     DEFINES += QT_SIMULATOR
     PRIVATE_HEADERS += simulator/qsysteminfodata_simulator_p.h \
+                       linux/qdeviceinfo_linux_p.h \
+                       linux/qnetworkinfo_linux_p.h \
                        simulator/qsysteminfobackend_simulator_p.h \
                        simulator/qsysteminfoconnection_simulator_p.h \
                        simulator/qsysteminfo_simulator_p.h
 
 
     SOURCES += simulator/qsysteminfodata_simulator.cpp \
+               qinputinfo.cpp \
+               linux/qdeviceinfo_linux.cpp \
+               linux/qnetworkinfo_linux.cpp \
+               linux/qinputinfomanager.cpp \
                simulator/qsysteminfobackend_simulator.cpp \
                simulator/qsysteminfoconnection_simulator.cpp \
                simulator/qsysteminfo_simulator.cpp
 
+   HEADERS += \
+         qinputinfo.h \
+         linux/qinputinfomanager_p.h
 
     linux-*: {
         PRIVATE_HEADERS += \