Ticket #46496: update-QtBearer-NetworkManager-backend-API.patch

File update-QtBearer-NetworkManager-backend-API.patch, 3.0 KB (added by RJVB (René Bertin), 9 years ago)

from Ubuntu

  • qtbase/src/network/doc/src/bearermanagement.qdoc 

    From 151061ad4af9d1b844f0b029b4e84a3577487048 Mon Sep 17 00:00:00 2001
From: Lorn Potter <lorn.potter@jollamobile.com>
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 <lorn.potter@gmail.com>
---
 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(-)
     
    248248        \li Linux uses the \l {http://projects.gnome.org/NetworkManager}{NetworkManager}
    249249           and \l {http://connman.net/}{ConnMan} / \l {http://ofono.org/}{oFono} APIs
    250250           which support interface notifications and starting and stopping of network
    251            interfaces.
     251           interfaces. Network Manager version 0.9 and above is supported.
    252252    \row
    253253        \li Windows\unicode{0xAE} XP
    254254        \li This platform supports interface notifications without active polling.

  • qtbase/tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp

     
    279279                                                 << QLatin1String("WCDMA")
    280280                                                 << QLatin1String("HSPA")
    281281                                                 << QLatin1String("Bluetooth")
    282                                                  << QLatin1String("WiMAX");
     282                                                 << QLatin1String("WiMAX")
     283                                                 << QLatin1String("BearerEVDO")
     284                                                 << QLatin1String("BearerLTE")
     285                                                 << QLatin1String("Bearer3G")
     286                                                 << QLatin1String("Bearer4G");
    283287
    284288    if (!configuration.isValid()) {
    285289        QVERIFY(configuration.bearerTypeName().isEmpty());
    … …  
    10351039            if (config.bearerTypeName() != "2G" &&
    10361040                config.bearerTypeName() != "CDMA2000" &&
    10371041                config.bearerTypeName() != "WCDMA" &&
    1038                 config.bearerTypeName() != "HSPA") {
     1042                config.bearerTypeName() != "HSPA" &&
     1043                config.bearerTypeName() != "EVDO" &&
     1044                config.bearerTypeName() != "LTE" &&
     1045                config.bearerTypeName() != "3G" &&
     1046                config.bearerTypeName() != "4G") {
    10391047                // qDebug() << "Dumping config because bearer mismatches (cellular): " << config.name();
    10401048                discoveredConfigs.removeOne(config);
    10411049            }