From 151061ad4af9d1b844f0b029b4e84a3577487048 Mon Sep 17 00:00:00 2001 From: Lorn Potter Date: Fri, 3 Oct 2014 19:30:04 +1000 Subject: [PATCH] update QtBearer NetworkManager backend API Task-number: QTBUG-41747 Change-Id: Idb4afea0215b94957a11895c7db97a72ae680804 Reviewed-by: Lorn Potter --- src/network/doc/src/bearermanagement.qdoc | 2 +- .../networkmanager/qnetworkmanagerengine.cpp | 124 ++++++++++----------- .../bearer/networkmanager/qnetworkmanagerengine.h | 3 +- .../networkmanager/qnetworkmanagerservice.cpp | 30 ++--- .../bearer/networkmanager/qnetworkmanagerservice.h | 6 +- .../qnetworksession/test/tst_qnetworksession.cpp | 12 +- 6 files changed, 90 insertions(+), 87 deletions(-) --- qtbase/src/network/doc/src/bearermanagement.qdoc +++ qtbase/src/network/doc/src/bearermanagement.qdoc @@ -248,7 +248,7 @@ \li Linux uses the \l {http://projects.gnome.org/NetworkManager}{NetworkManager} and \l {http://connman.net/}{ConnMan} / \l {http://ofono.org/}{oFono} APIs which support interface notifications and starting and stopping of network - interfaces. + interfaces. Network Manager version 0.9 and above is supported. \row \li Windows\unicode{0xAE} XP \li This platform supports interface notifications without active polling. --- qtbase/tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp +++ qtbase/tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp @@ -279,7 +279,11 @@ << QLatin1String("WCDMA") << QLatin1String("HSPA") << QLatin1String("Bluetooth") - << QLatin1String("WiMAX"); + << QLatin1String("WiMAX") + << QLatin1String("BearerEVDO") + << QLatin1String("BearerLTE") + << QLatin1String("Bearer3G") + << QLatin1String("Bearer4G"); if (!configuration.isValid()) { QVERIFY(configuration.bearerTypeName().isEmpty()); @@ -1035,7 +1039,11 @@ if (config.bearerTypeName() != "2G" && config.bearerTypeName() != "CDMA2000" && config.bearerTypeName() != "WCDMA" && - config.bearerTypeName() != "HSPA") { + config.bearerTypeName() != "HSPA" && + config.bearerTypeName() != "EVDO" && + config.bearerTypeName() != "LTE" && + config.bearerTypeName() != "3G" && + config.bearerTypeName() != "4G") { // qDebug() << "Dumping config because bearer mismatches (cellular): " << config.name(); discoveredConfigs.removeOne(config); }