File update-bearer-plugin-git-7ed41b0.patch of Package qtbase

diff -Naur qtbase-opensource-src-5.0.1/src/plugins/bearer//blackberry/qbbengine.cpp qtbase-git/src/plugins/bearer//blackberry/qbbengine.cpp
--- qtbase-opensource-src-5.0.1/src/plugins/bearer//blackberry/qbbengine.cpp	2013-01-29 20:03:01.000000000 +0100
+++ qtbase-git/src/plugins/bearer//blackberry/qbbengine.cpp	2013-03-04 16:40:14.703564506 +0100
@@ -45,6 +45,7 @@
 #include <QDebug>
 #include <QThreadStorage>
 #include <QStringList>
+#include <QTimer>
 
 #include <bps/netstatus.h>
 
@@ -355,6 +356,9 @@
             changed = true;
         }
 
+        const netstatus_ip_status_t oldIpStatus = ptr->oldIpStatus;
+        ptr->oldIpStatus = ipStatus;
+
         ptrLocker.unlock();
 
         locker.unlock();
@@ -364,7 +368,17 @@
 
             Q_EMIT configurationChanged(ptr);
         } else {
+            // maybe Wifi has changed but gateway not yet ready etc.
             qBearerDebug() << Q_FUNC_INFO << "configuration has not changed.";
+            if (oldIpStatus != ipStatus) { // if IP status changed
+                if (ipStatus != NETSTATUS_IP_STATUS_OK
+                        && ipStatus != NETSTATUS_IP_STATUS_ERROR_NOT_UP
+                        && ipStatus != NETSTATUS_IP_STATUS_ERROR_NOT_CONFIGURED) {
+                    // work around race condition in netstatus API by just checking
+                    // again in 300 ms
+                    QTimer::singleShot(300, this, SLOT(doRequestUpdate()));
+                }
+            }
         }
 
         return;
diff -Naur qtbase-opensource-src-5.0.1/src/plugins/bearer//connman/main.cpp qtbase-git/src/plugins/bearer//connman/main.cpp
--- qtbase-opensource-src-5.0.1/src/plugins/bearer//connman/main.cpp	2013-01-29 20:03:01.000000000 +0100
+++ qtbase-git/src/plugins/bearer//connman/main.cpp	2013-03-04 16:40:14.703564506 +0100
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the plugins of the Qt Toolkit.
diff -Naur qtbase-opensource-src-5.0.1/src/plugins/bearer//connman/qconnmanengine.cpp qtbase-git/src/plugins/bearer//connman/qconnmanengine.cpp
--- qtbase-opensource-src-5.0.1/src/plugins/bearer//connman/qconnmanengine.cpp	2013-01-29 20:03:01.000000000 +0100
+++ qtbase-git/src/plugins/bearer//connman/qconnmanengine.cpp	2013-03-04 16:40:14.703564506 +0100
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the plugins of the Qt Toolkit.
@@ -159,7 +159,7 @@
             QOfonoDataConnectionManagerInterface dc(modemPath,0);
             foreach (const QDBusObjectPath &dcPath,dc.getPrimaryContexts()) {
                 if(dcPath.path().contains(servicePath.section("_",-1))) {
-                    QOfonoPrimaryDataContextInterface primaryContext(dcPath.path(),0);
+                    QOfonoConnectionContextInterface primaryContext(dcPath.path(),0);
                     primaryContext.setActive(true);
                 }
             }
@@ -183,7 +183,7 @@
             QOfonoDataConnectionManagerInterface dc(modemPath,0);
             foreach (const QDBusObjectPath &dcPath,dc.getPrimaryContexts()) {
                 if(dcPath.path().contains(servicePath.section("_",-1))) {
-                    QOfonoPrimaryDataContextInterface primaryContext(dcPath.path(),0);
+                    QOfonoConnectionContextInterface primaryContext(dcPath.path(),0);
                     primaryContext.setActive(false);
                 }
             }
diff -Naur qtbase-opensource-src-5.0.1/src/plugins/bearer//connman/qconnmanengine.h qtbase-git/src/plugins/bearer//connman/qconnmanengine.h
--- qtbase-opensource-src-5.0.1/src/plugins/bearer//connman/qconnmanengine.h	2013-01-29 20:03:01.000000000 +0100
+++ qtbase-git/src/plugins/bearer//connman/qconnmanengine.h	2013-03-04 16:40:14.703564506 +0100
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the plugins of the Qt Toolkit.
diff -Naur qtbase-opensource-src-5.0.1/src/plugins/bearer//connman/qconnmanservice_linux.cpp qtbase-git/src/plugins/bearer//connman/qconnmanservice_linux.cpp
--- qtbase-opensource-src-5.0.1/src/plugins/bearer//connman/qconnmanservice_linux.cpp	2013-01-29 20:03:01.000000000 +0100
+++ qtbase-git/src/plugins/bearer//connman/qconnmanservice_linux.cpp	2013-03-04 16:40:14.703564506 +0100
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the plugins of the Qt Toolkit.
diff -Naur qtbase-opensource-src-5.0.1/src/plugins/bearer//connman/qconnmanservice_linux_p.h qtbase-git/src/plugins/bearer//connman/qconnmanservice_linux_p.h
--- qtbase-opensource-src-5.0.1/src/plugins/bearer//connman/qconnmanservice_linux_p.h	2013-01-29 20:03:01.000000000 +0100
+++ qtbase-git/src/plugins/bearer//connman/qconnmanservice_linux_p.h	2013-03-04 16:40:14.704564500 +0100
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the plugins of the Qt Toolkit.
diff -Naur qtbase-opensource-src-5.0.1/src/plugins/bearer//connman/qofonoservice_linux.cpp qtbase-git/src/plugins/bearer//connman/qofonoservice_linux.cpp
--- qtbase-opensource-src-5.0.1/src/plugins/bearer//connman/qofonoservice_linux.cpp	2013-01-29 20:03:01.000000000 +0100
+++ qtbase-git/src/plugins/bearer//connman/qofonoservice_linux.cpp	2013-03-04 16:40:14.704564500 +0100
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the plugins of the Qt Toolkit.
@@ -56,6 +56,22 @@
 #ifndef QT_NO_BEARERMANAGEMENT
 #ifndef QT_NO_DBUS
 
+QDBusArgument &operator<<(QDBusArgument &argument, const ObjectPathProperties &item)
+{
+    argument.beginStructure();
+    argument << item.path << item.properties;
+    argument.endStructure();
+    return argument;
+}
+
+const QDBusArgument &operator>>(const QDBusArgument &argument, ObjectPathProperties &item)
+{
+    argument.beginStructure();
+    argument >> item.path >> item.properties;
+    argument.endStructure();
+    return argument;
+}
+
 QT_BEGIN_NAMESPACE
 
 QOfonoManagerInterface::QOfonoManagerInterface( QObject *parent)
@@ -64,6 +80,8 @@
                                  OFONO_MANAGER_INTERFACE,
                                  QDBusConnection::systemBus(), parent)
 {
+    qDBusRegisterMetaType<ObjectPathProperties>();
+    qDBusRegisterMetaType<PathPropertiesList>();
 }
 
 QOfonoManagerInterface::~QOfonoManagerInterface()
@@ -72,8 +90,16 @@
 
 QList <QDBusObjectPath> QOfonoManagerInterface::getModems()
 {
-    QVariant var = getProperty("Modems");
-    return qdbus_cast<QList<QDBusObjectPath> >(var);
+    QList <QDBusObjectPath> modemList;
+    QList<QVariant> argumentList;
+    QDBusReply<PathPropertiesList > reply = this->asyncCallWithArgumentList(QLatin1String("GetModems"), argumentList);
+    if (reply.isValid()) {
+        foreach (ObjectPathProperties modem, reply.value()) {
+            modemList << modem.path;
+        }
+    }
+
+    return modemList;
 }
 
 QDBusObjectPath QOfonoManagerInterface::currentModem()
@@ -81,8 +107,8 @@
     QList<QDBusObjectPath> modems = getModems();
     foreach (const QDBusObjectPath &modem, modems) {
         QOfonoModemInterface device(modem.path());
-        if(device.isPowered() && device.isOnline())
-        return modem;;
+        if (device.isPowered() && device.isOnline())
+        return modem;
     }
     return QDBusObjectPath();
 }
@@ -92,7 +118,7 @@
 {
     static const QMetaMethod propertyChangedSignal = QMetaMethod::fromSignal(&QOfonoManagerInterface::propertyChanged);
     if (signal == propertyChangedSignal) {
-        if(!connection().connect(QLatin1String(OFONO_SERVICE),
+        if (!connection().connect(QLatin1String(OFONO_SERVICE),
                                QLatin1String(OFONO_MANAGER_PATH),
                                QLatin1String(OFONO_MANAGER_INTERFACE),
                                QLatin1String("PropertyChanged"),
@@ -140,7 +166,7 @@
 QVariantMap QOfonoManagerInterface::getProperties()
 {
     QDBusReply<QVariantMap > reply = this->call(QLatin1String("GetProperties"));
-    if(reply.isValid())
+    if (reply.isValid())
         return reply.value();
     else
         return QVariantMap();
@@ -234,7 +260,7 @@
 
 QString QOfonoModemInterface::defaultInterface()
 {
-    foreach(const QString &modem,getInterfaces()) {
+    foreach (const QString &modem,getInterfaces()) {
      return modem;
     }
     return QString();
@@ -245,7 +271,7 @@
 {
     static const QMetaMethod propertyChangedSignal = QMetaMethod::fromSignal(&QOfonoModemInterface::propertyChanged);
     if (signal == propertyChangedSignal) {
-            if(!connection().connect(QLatin1String(OFONO_SERVICE),
+            if (!connection().connect(QLatin1String(OFONO_SERVICE),
                                    this->path(),
                                    QLatin1String(OFONO_MODEM_INTERFACE),
                                    QLatin1String("PropertyChanged"),
@@ -363,15 +389,23 @@
 
 QList <QDBusObjectPath> QOfonoNetworkRegistrationInterface::getOperators()
 {
-    QVariant var = getProperty("Operators");
-    return qdbus_cast<QList <QDBusObjectPath> >(var);
+    QList <QDBusObjectPath> operatorList;
+    QList<QVariant> argumentList;
+    QDBusReply<PathPropertiesList > reply = this->asyncCallWithArgumentList(QLatin1String("GetOperators"),
+                                                                                argumentList);
+    if (reply.isValid()) {
+        foreach (ObjectPathProperties netop, reply.value()) {
+            operatorList << netop.path;
+        }
+    }
+    return operatorList;
 }
 
 void QOfonoNetworkRegistrationInterface::connectNotify(const QMetaMethod &signal)
 {
     static const QMetaMethod propertyChangedSignal = QMetaMethod::fromSignal(&QOfonoNetworkRegistrationInterface::propertyChanged);
     if (signal == propertyChangedSignal) {
-        if(!connection().connect(QLatin1String(OFONO_SERVICE),
+        if (!connection().connect(QLatin1String(OFONO_SERVICE),
                                this->path(),
                                QLatin1String(OFONO_NETWORK_REGISTRATION_INTERFACE),
                                QLatin1String("PropertyChanged"),
@@ -473,7 +507,7 @@
     Q_UNUSED(signal);
 //    static const QMetaMethod propertyChangedSignal = QMetaMethod::fromSignal(&QOfonoNetworkOperatorInterface::propertyChanged);
 //    if (signal == propertyChangedSignal) {
-//        if(!connection().connect(QLatin1String(OFONO_SERVICE),
+//        if (!connection().connect(QLatin1String(OFONO_SERVICE),
 //                               this->path(),
 //                               QLatin1String(OFONO_NETWORK_OPERATOR_INTERFACE),
 //                               QLatin1String("PropertyChanged"),
@@ -581,7 +615,7 @@
     Q_UNUSED(signal);
 //    static const QMetaMethod propertyChangedSignal = QMetaMethod::fromSignal(&QOfonoSimInterface::propertyChanged);
 //    if (signal == propertyChangedSignal) {
-//        if(!connection().connect(QLatin1String(OFONO_SERVICE),
+//        if (!connection().connect(QLatin1String(OFONO_SERVICE),
 //                               this->path(),
 //                               QLatin1String(OFONO_SIM_MANAGER_INTERFACE),
 //                               QLatin1String("PropertyChanged"),
@@ -648,8 +682,16 @@
 
 QList<QDBusObjectPath> QOfonoDataConnectionManagerInterface::getPrimaryContexts()
 {
-    QVariant var = getProperty("PrimaryContexts");
-    return qdbus_cast<QList<QDBusObjectPath> >(var);
+    QList <QDBusObjectPath> contextList;
+    QList<QVariant> argumentList;
+    QDBusReply<PathPropertiesList > reply = this->asyncCallWithArgumentList(QLatin1String("GetContexts"),
+                                                                         argumentList);
+    if (reply.isValid()) {
+        foreach (ObjectPathProperties context, reply.value()) {
+            contextList << context.path;
+        }
+    }
+    return contextList;
 }
 
 bool QOfonoDataConnectionManagerInterface::isAttached()
@@ -675,7 +717,7 @@
     Q_UNUSED(signal);
 //    static const QMetaMethod propertyChangedSignal = QMetaMethod::fromSignal(&QOfonoDataConnectionManagerInterface::propertyChanged);
 //    if (signal == propertyChangedSignal) {
-//        if(!connection().connect(QLatin1String(OFONO_SERVICE),
+//        if (!connection().connect(QLatin1String(OFONO_SERVICE),
 //                               this->path(),
 //                               QLatin1String(OFONO_DATA_CONNECTION_MANAGER_INTERFACE),
 //                               QLatin1String("PropertyChanged"),
@@ -728,7 +770,7 @@
     return reply.value();
 }
 
-QOfonoPrimaryDataContextInterface::QOfonoPrimaryDataContextInterface(const QString &dbusPathName, QObject *parent)
+QOfonoConnectionContextInterface::QOfonoConnectionContextInterface(const QString &dbusPathName, QObject *parent)
     : QDBusAbstractInterface(QLatin1String(OFONO_SERVICE),
                              dbusPathName,
                              OFONO_DATA_CONTEXT_INTERFACE,
@@ -736,70 +778,70 @@
 {
 }
 
-QOfonoPrimaryDataContextInterface::~QOfonoPrimaryDataContextInterface()
+QOfonoConnectionContextInterface::~QOfonoConnectionContextInterface()
 {
 }
 
-bool QOfonoPrimaryDataContextInterface::isActive()
+bool QOfonoConnectionContextInterface::isActive()
 {
     QVariant var = getProperty("Active");
     return qdbus_cast<bool>(var);
 }
 
-QString QOfonoPrimaryDataContextInterface::getApName()
+QString QOfonoConnectionContextInterface::getApName()
 {
     QVariant var = getProperty("AccessPointName");
     return qdbus_cast<QString>(var);
 }
 
-QString QOfonoPrimaryDataContextInterface::getType()
+QString QOfonoConnectionContextInterface::getType()
 {
     QVariant var = getProperty("Type");
     return qdbus_cast<QString>(var);
 }
 
-QString QOfonoPrimaryDataContextInterface::getName()
+QString QOfonoConnectionContextInterface::getName()
 {
     QVariant var = getProperty("Name");
     return qdbus_cast<QString>(var);
 }
 
-QVariantMap QOfonoPrimaryDataContextInterface::getSettings()
+QVariantMap QOfonoConnectionContextInterface::getSettings()
 {
     QVariant var = getProperty("Settings");
     return qdbus_cast<QVariantMap>(var);
 }
 
-QString QOfonoPrimaryDataContextInterface::getInterface()
+QString QOfonoConnectionContextInterface::getInterface()
 {
     QVariant var = getProperty("Interface");
     return qdbus_cast<QString>(var);
 }
 
-QString QOfonoPrimaryDataContextInterface::getAddress()
+QString QOfonoConnectionContextInterface::getAddress()
 {
     QVariant var = getProperty("Address");
     return qdbus_cast<QString>(var);
 }
 
-bool QOfonoPrimaryDataContextInterface::setActive(bool on)
+bool QOfonoConnectionContextInterface::setActive(bool on)
 {
 //    this->setProperty("Active", QVariant(on));
 
     return setProp("Active", QVariant::fromValue(on));
 }
 
-bool QOfonoPrimaryDataContextInterface::setApn(const QString &name)
+bool QOfonoConnectionContextInterface::setApn(const QString &name)
 {
     return setProp("AccessPointName", QVariant::fromValue(name));
 }
 
-void QOfonoPrimaryDataContextInterface::connectNotify(const QMetaMethod &signal)
+void QOfonoConnectionContextInterface::connectNotify(const QMetaMethod &signal)
 {
     Q_UNUSED(signal);
-//    static const QMetaMethod propertyChangedSignal = QMetaMethod::fromSignal(&QOfonoPrimaryDataContextInterface::propertyChanged);
+//    static const QMetaMethod propertyChangedSignal = QMetaMethod::fromSignal(&QOfonoConnectionContextInterface::propertyChanged);
 //    if (signal == propertyChangedSignal) {
-//        if(!connection().connect(QLatin1String(OFONO_SERVICE),
+//        if (!connection().connect(QLatin1String(OFONO_SERVICE),
 //                               this->path(),
 //                               QLatin1String(OFONO_DATA_CONTEXT_INTERFACE),
 //                               QLatin1String("PropertyChanged"),
@@ -808,7 +850,7 @@
 //        }
 //    }
 
-//    static const QMetaMethod propertyChangedContextSignal = QMetaMethod::fromSignal(&QOfonoPrimaryDataContextInterface::propertyChangedContext);
+//    static const QMetaMethod propertyChangedContextSignal = QMetaMethod::fromSignal(&QOfonoConnectionContextInterface::propertyChangedContext);
 //    if (signal == propertyChangedContextSignal) {
 //        QOfonoDBusHelper *helper;
 //        helper = new QOfonoDBusHelper(this);
@@ -825,16 +867,16 @@
 //    }
 }
 
-void QOfonoPrimaryDataContextInterface::disconnectNotify(const QMetaMethod &signal)
+void QOfonoConnectionContextInterface::disconnectNotify(const QMetaMethod &signal)
 {
     Q_UNUSED(signal);
-//    static const QMetaMethod propertyChangedSignal = QMetaMethod::fromSignal(&QOfonoPrimaryDataContextInterface::propertyChanged);
+//    static const QMetaMethod propertyChangedSignal = QMetaMethod::fromSignal(&QOfonoConnectionContextInterface::propertyChanged);
 //    if (signal == propertyChangedSignal) {
 
 //    }
 }
 
-QVariant QOfonoPrimaryDataContextInterface::getProperty(const QString &property)
+QVariant QOfonoConnectionContextInterface::getProperty(const QString &property)
 {
     QVariant var;
     QVariantMap map = getProperties();
@@ -846,13 +888,13 @@
     return var;
 }
 
-QVariantMap QOfonoPrimaryDataContextInterface::getProperties()
+QVariantMap QOfonoConnectionContextInterface::getProperties()
 {
     QDBusReply<QVariantMap > reply =  this->call(QLatin1String("GetProperties"));
     return reply.value();
 }
 
-bool QOfonoPrimaryDataContextInterface::setProp(const QString &property, const QVariant &var)
+bool QOfonoConnectionContextInterface::setProp(const QString &property, const QVariant &var)
 {
     QList<QVariant> args;
     args << QVariant::fromValue(property) << QVariant::fromValue(QDBusVariant(var));
@@ -861,7 +903,7 @@
                                                     QLatin1String("SetProperty"),
                                                     args);
     bool ok = true;
-    if(reply.type() != QDBusMessage::ReplyMessage) {
+    if (reply.type() != QDBusMessage::ReplyMessage) {
         qWarning() << reply.errorMessage();
         ok = false;
     }
@@ -885,7 +927,7 @@
 {
     static const QMetaMethod propertyChangedSignal = QMetaMethod::fromSignal(&QOfonoSmsInterface::propertyChanged);
     if (signal == propertyChangedSignal) {
-        if(!connection().connect(QLatin1String(OFONO_SERVICE),
+        if (!connection().connect(QLatin1String(OFONO_SERVICE),
                                  this->path(),
                                  QLatin1String(OFONO_SMS_MANAGER_INTERFACE),
                                  QLatin1String("PropertyChanged"),
@@ -912,7 +954,7 @@
 
     static const QMetaMethod immediateMessageSignal = QMetaMethod::fromSignal(&QOfonoSmsInterface::immediateMessage);
     if (signal == immediateMessageSignal) {
-        if(!connection().connect(QLatin1String(OFONO_SERVICE),
+        if (!connection().connect(QLatin1String(OFONO_SERVICE),
                                  this->path(),
                                  QLatin1String(OFONO_SMS_MANAGER_INTERFACE),
                                  QLatin1String("ImmediateMessage"),
@@ -923,7 +965,7 @@
 
     static const QMetaMethod incomingMessageSignal = QMetaMethod::fromSignal(&QOfonoSmsInterface::incomingMessage);
     if (signal == incomingMessageSignal) {
-        if(!connection().connect(QLatin1String(OFONO_SERVICE),
+        if (!connection().connect(QLatin1String(OFONO_SERVICE),
                                  this->path(),
                                  QLatin1String(OFONO_SMS_MANAGER_INTERFACE),
                                  QLatin1String("IncomingMessage"),
diff -Naur qtbase-opensource-src-5.0.1/src/plugins/bearer//connman/qofonoservice_linux_p.h qtbase-git/src/plugins/bearer//connman/qofonoservice_linux_p.h
--- qtbase-opensource-src-5.0.1/src/plugins/bearer//connman/qofonoservice_linux_p.h	2013-01-29 20:03:01.000000000 +0100
+++ qtbase-git/src/plugins/bearer//connman/qofonoservice_linux_p.h	2013-03-04 16:40:14.704564500 +0100
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the plugins of the Qt Toolkit.
@@ -76,7 +76,7 @@
 #define OFONO_NETWORK_OPERATOR_INTERFACE         "org.ofono.NetworkOperator"
 #define OFONO_DATA_CONNECTION_MANAGER_INTERFACE  "org.ofono.DataConnectionManager"
 #define OFONO_SIM_MANAGER_INTERFACE              "org.ofono.SimManager"
-#define OFONO_DATA_CONTEXT_INTERFACE             "org.ofono.PrimaryDataContext"
+#define OFONO_DATA_CONTEXT_INTERFACE             "org.ofono.ConnectionContext"
 
 #define OFONO_SMS_MANAGER_INTERFACE              "org.ofono.SmsManager"
 #define OFONO_PHONEBOOK_INTERFACE                "org.ofono.Phonebook"
@@ -88,6 +88,14 @@
 
 QT_END_NAMESPACE
 
+struct ObjectPathProperties
+{
+    QDBusObjectPath path;
+    QVariantMap properties;
+};
+typedef QList<ObjectPathProperties> PathPropertiesList;
+Q_DECLARE_METATYPE(ObjectPathProperties)
+Q_DECLARE_METATYPE (PathPropertiesList)
 
 QT_BEGIN_NAMESPACE
 
@@ -273,14 +281,14 @@
 };
 
 
-class QOfonoPrimaryDataContextInterface : public QDBusAbstractInterface
+class QOfonoConnectionContextInterface : public QDBusAbstractInterface
 {
     Q_OBJECT
 
 public:
 
-    explicit QOfonoPrimaryDataContextInterface(const QString &dbusPathName, QObject *parent = 0);
-    ~QOfonoPrimaryDataContextInterface();
+    explicit QOfonoConnectionContextInterface(const QString &dbusPathName, QObject *parent = 0);
+    ~QOfonoConnectionContextInterface();
 
     QVariantMap getProperties();
 
diff -Naur qtbase-opensource-src-5.0.1/src/plugins/bearer//corewlan/main.cpp qtbase-git/src/plugins/bearer//corewlan/main.cpp
--- qtbase-opensource-src-5.0.1/src/plugins/bearer//corewlan/main.cpp	2013-01-29 20:03:01.000000000 +0100
+++ qtbase-git/src/plugins/bearer//corewlan/main.cpp	2013-03-04 16:40:14.704564500 +0100
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the plugins of the Qt Toolkit.
diff -Naur qtbase-opensource-src-5.0.1/src/plugins/bearer//corewlan/qcorewlanengine.h qtbase-git/src/plugins/bearer//corewlan/qcorewlanengine.h
--- qtbase-opensource-src-5.0.1/src/plugins/bearer//corewlan/qcorewlanengine.h	2013-01-29 20:03:01.000000000 +0100
+++ qtbase-git/src/plugins/bearer//corewlan/qcorewlanengine.h	2013-03-04 16:40:14.704564500 +0100
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the plugins of the Qt Toolkit.
diff -Naur qtbase-opensource-src-5.0.1/src/plugins/bearer//corewlan/qcorewlanengine.mm qtbase-git/src/plugins/bearer//corewlan/qcorewlanengine.mm
--- qtbase-opensource-src-5.0.1/src/plugins/bearer//corewlan/qcorewlanengine.mm	2013-01-29 20:03:01.000000000 +0100
+++ qtbase-git/src/plugins/bearer//corewlan/qcorewlanengine.mm	2013-03-04 16:40:14.704564500 +0100
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the plugins of the Qt Toolkit.
diff -Naur qtbase-opensource-src-5.0.1/src/plugins/bearer//generic/main.cpp qtbase-git/src/plugins/bearer//generic/main.cpp
--- qtbase-opensource-src-5.0.1/src/plugins/bearer//generic/main.cpp	2013-01-29 20:03:01.000000000 +0100
+++ qtbase-git/src/plugins/bearer//generic/main.cpp	2013-03-04 16:40:14.704564500 +0100
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the plugins of the Qt Toolkit.
diff -Naur qtbase-opensource-src-5.0.1/src/plugins/bearer//generic/qgenericengine.cpp qtbase-git/src/plugins/bearer//generic/qgenericengine.cpp
--- qtbase-opensource-src-5.0.1/src/plugins/bearer//generic/qgenericengine.cpp	2013-01-29 20:03:01.000000000 +0100
+++ qtbase-git/src/plugins/bearer//generic/qgenericengine.cpp	2013-03-04 16:40:14.705564494 +0100
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the plugins of the Qt Toolkit.
diff -Naur qtbase-opensource-src-5.0.1/src/plugins/bearer//generic/qgenericengine.h qtbase-git/src/plugins/bearer//generic/qgenericengine.h
--- qtbase-opensource-src-5.0.1/src/plugins/bearer//generic/qgenericengine.h	2013-01-29 20:03:01.000000000 +0100
+++ qtbase-git/src/plugins/bearer//generic/qgenericengine.h	2013-03-04 16:40:14.705564494 +0100
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the plugins of the Qt Toolkit.
diff -Naur qtbase-opensource-src-5.0.1/src/plugins/bearer//nativewifi/main.cpp qtbase-git/src/plugins/bearer//nativewifi/main.cpp
--- qtbase-opensource-src-5.0.1/src/plugins/bearer//nativewifi/main.cpp	2013-01-29 20:03:01.000000000 +0100
+++ qtbase-git/src/plugins/bearer//nativewifi/main.cpp	2013-03-04 16:40:14.705564494 +0100
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the plugins of the Qt Toolkit.
diff -Naur qtbase-opensource-src-5.0.1/src/plugins/bearer//nativewifi/platformdefs.h qtbase-git/src/plugins/bearer//nativewifi/platformdefs.h
--- qtbase-opensource-src-5.0.1/src/plugins/bearer//nativewifi/platformdefs.h	2013-01-29 20:03:01.000000000 +0100
+++ qtbase-git/src/plugins/bearer//nativewifi/platformdefs.h	2013-03-04 16:40:14.705564494 +0100
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the plugins of the Qt Toolkit.
diff -Naur qtbase-opensource-src-5.0.1/src/plugins/bearer//nativewifi/qnativewifiengine.cpp qtbase-git/src/plugins/bearer//nativewifi/qnativewifiengine.cpp
--- qtbase-opensource-src-5.0.1/src/plugins/bearer//nativewifi/qnativewifiengine.cpp	2013-01-29 20:03:01.000000000 +0100
+++ qtbase-git/src/plugins/bearer//nativewifi/qnativewifiengine.cpp	2013-03-04 16:40:14.705564494 +0100
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the plugins of the Qt Toolkit.
diff -Naur qtbase-opensource-src-5.0.1/src/plugins/bearer//nativewifi/qnativewifiengine.h qtbase-git/src/plugins/bearer//nativewifi/qnativewifiengine.h
--- qtbase-opensource-src-5.0.1/src/plugins/bearer//nativewifi/qnativewifiengine.h	2013-01-29 20:03:01.000000000 +0100
+++ qtbase-git/src/plugins/bearer//nativewifi/qnativewifiengine.h	2013-03-04 16:40:14.705564494 +0100
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the plugins of the Qt Toolkit.
diff -Naur qtbase-opensource-src-5.0.1/src/plugins/bearer//networkmanager/main.cpp qtbase-git/src/plugins/bearer//networkmanager/main.cpp
--- qtbase-opensource-src-5.0.1/src/plugins/bearer//networkmanager/main.cpp	2013-01-29 20:03:01.000000000 +0100
+++ qtbase-git/src/plugins/bearer//networkmanager/main.cpp	2013-03-04 16:40:14.705564494 +0100
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the plugins of the Qt Toolkit.
diff -Naur qtbase-opensource-src-5.0.1/src/plugins/bearer//networkmanager/qnetworkmanagerengine.cpp qtbase-git/src/plugins/bearer//networkmanager/qnetworkmanagerengine.cpp
--- qtbase-opensource-src-5.0.1/src/plugins/bearer//networkmanager/qnetworkmanagerengine.cpp	2013-01-29 20:03:01.000000000 +0100
+++ qtbase-git/src/plugins/bearer//networkmanager/qnetworkmanagerengine.cpp	2013-03-04 16:40:14.705564494 +0100
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the plugins of the Qt Toolkit.
diff -Naur qtbase-opensource-src-5.0.1/src/plugins/bearer//networkmanager/qnetworkmanagerengine.h qtbase-git/src/plugins/bearer//networkmanager/qnetworkmanagerengine.h
--- qtbase-opensource-src-5.0.1/src/plugins/bearer//networkmanager/qnetworkmanagerengine.h	2013-01-29 20:03:01.000000000 +0100
+++ qtbase-git/src/plugins/bearer//networkmanager/qnetworkmanagerengine.h	2013-03-04 16:40:14.706564488 +0100
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the plugins of the Qt Toolkit.
diff -Naur qtbase-opensource-src-5.0.1/src/plugins/bearer//networkmanager/qnetworkmanagerservice.cpp qtbase-git/src/plugins/bearer//networkmanager/qnetworkmanagerservice.cpp
--- qtbase-opensource-src-5.0.1/src/plugins/bearer//networkmanager/qnetworkmanagerservice.cpp	2013-01-29 20:03:01.000000000 +0100
+++ qtbase-git/src/plugins/bearer//networkmanager/qnetworkmanagerservice.cpp	2013-03-04 16:40:14.706564488 +0100
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the plugins of the Qt Toolkit.
diff -Naur qtbase-opensource-src-5.0.1/src/plugins/bearer//networkmanager/qnetworkmanagerservice.h qtbase-git/src/plugins/bearer//networkmanager/qnetworkmanagerservice.h
--- qtbase-opensource-src-5.0.1/src/plugins/bearer//networkmanager/qnetworkmanagerservice.h	2013-01-29 20:03:01.000000000 +0100
+++ qtbase-git/src/plugins/bearer//networkmanager/qnetworkmanagerservice.h	2013-03-04 16:40:14.706564488 +0100
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the plugins of the Qt Toolkit.
diff -Naur qtbase-opensource-src-5.0.1/src/plugins/bearer//networkmanager/qnmdbushelper.cpp qtbase-git/src/plugins/bearer//networkmanager/qnmdbushelper.cpp
--- qtbase-opensource-src-5.0.1/src/plugins/bearer//networkmanager/qnmdbushelper.cpp	2013-01-29 20:03:01.000000000 +0100
+++ qtbase-git/src/plugins/bearer//networkmanager/qnmdbushelper.cpp	2013-03-04 16:40:14.706564488 +0100
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the plugins of the Qt Toolkit.
diff -Naur qtbase-opensource-src-5.0.1/src/plugins/bearer//networkmanager/qnmdbushelper.h qtbase-git/src/plugins/bearer//networkmanager/qnmdbushelper.h
--- qtbase-opensource-src-5.0.1/src/plugins/bearer//networkmanager/qnmdbushelper.h	2013-01-29 20:03:01.000000000 +0100
+++ qtbase-git/src/plugins/bearer//networkmanager/qnmdbushelper.h	2013-03-04 16:40:14.706564488 +0100
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the plugins of the Qt Toolkit.
diff -Naur qtbase-opensource-src-5.0.1/src/plugins/bearer//nla/main.cpp qtbase-git/src/plugins/bearer//nla/main.cpp
--- qtbase-opensource-src-5.0.1/src/plugins/bearer//nla/main.cpp	2013-01-29 20:03:01.000000000 +0100
+++ qtbase-git/src/plugins/bearer//nla/main.cpp	2013-03-04 16:40:14.706564488 +0100
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the plugins of the Qt Toolkit.
diff -Naur qtbase-opensource-src-5.0.1/src/plugins/bearer//nla/qnlaengine.cpp qtbase-git/src/plugins/bearer//nla/qnlaengine.cpp
--- qtbase-opensource-src-5.0.1/src/plugins/bearer//nla/qnlaengine.cpp	2013-01-29 20:03:01.000000000 +0100
+++ qtbase-git/src/plugins/bearer//nla/qnlaengine.cpp	2013-03-04 16:40:14.706564488 +0100
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the plugins of the Qt Toolkit.
diff -Naur qtbase-opensource-src-5.0.1/src/plugins/bearer//nla/qnlaengine.h qtbase-git/src/plugins/bearer//nla/qnlaengine.h
--- qtbase-opensource-src-5.0.1/src/plugins/bearer//nla/qnlaengine.h	2013-01-29 20:03:01.000000000 +0100
+++ qtbase-git/src/plugins/bearer//nla/qnlaengine.h	2013-03-04 16:40:14.706564488 +0100
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the plugins of the Qt Toolkit.
diff -Naur qtbase-opensource-src-5.0.1/src/plugins/bearer//platformdefs_win.h qtbase-git/src/plugins/bearer//platformdefs_win.h
--- qtbase-opensource-src-5.0.1/src/plugins/bearer//platformdefs_win.h	2013-01-29 20:03:01.000000000 +0100
+++ qtbase-git/src/plugins/bearer//platformdefs_win.h	2013-03-04 16:40:14.706564488 +0100
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the plugins of the Qt Toolkit.
diff -Naur qtbase-opensource-src-5.0.1/src/plugins/bearer//qbearerengine_impl.h qtbase-git/src/plugins/bearer//qbearerengine_impl.h
--- qtbase-opensource-src-5.0.1/src/plugins/bearer//qbearerengine_impl.h	2013-01-29 20:03:01.000000000 +0100
+++ qtbase-git/src/plugins/bearer//qbearerengine_impl.h	2013-03-04 16:40:14.706564488 +0100
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the plugins of the Qt Toolkit.
diff -Naur qtbase-opensource-src-5.0.1/src/plugins/bearer//qnetworksession_impl.cpp qtbase-git/src/plugins/bearer//qnetworksession_impl.cpp
--- qtbase-opensource-src-5.0.1/src/plugins/bearer//qnetworksession_impl.cpp	2013-01-29 20:03:01.000000000 +0100
+++ qtbase-git/src/plugins/bearer//qnetworksession_impl.cpp	2013-03-04 16:40:14.707564482 +0100
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the plugins of the Qt Toolkit.
diff -Naur qtbase-opensource-src-5.0.1/src/plugins/bearer//qnetworksession_impl.h qtbase-git/src/plugins/bearer//qnetworksession_impl.h
--- qtbase-opensource-src-5.0.1/src/plugins/bearer//qnetworksession_impl.h	2013-01-29 20:03:01.000000000 +0100
+++ qtbase-git/src/plugins/bearer//qnetworksession_impl.h	2013-03-04 16:40:14.707564482 +0100
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the plugins of the Qt Toolkit.