diff options
author | Peter Hartmann <phartmann@rim.com> | 2013-02-21 14:42:04 +0100 |
---|---|---|
committer | Peter Hartmann <phartmann@blackberry.com> | 2013-05-07 16:42:41 +0200 |
commit | cff0b9e8aa6a8f411138d0e11715a09e5fb5e94f (patch) | |
tree | 6103451cd80528a99e7833d01b18c8c7e539c12d | |
parent | c67554fc3148b9849f7010896dcb753a7fc8dfb8 (diff) | |
download | qt4-tools-cff0b9e8aa6a8f411138d0e11715a09e5fb5e94f.tar.gz |
[BB10-internal] QNetworkConfiguration: store list of host addresses
... which can be populated by the bearer plugin.
Change-Id: Ibfa92eb7e480ef8c75b90f1dc0751c938d7afda7
Signed-off-by: Peter Hartmann <phartmann@rim.com>
-rw-r--r-- | src/network/bearer/qnetworkconfiguration.cpp | 4 | ||||
-rw-r--r-- | src/network/bearer/qnetworkconfiguration_p.h | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/network/bearer/qnetworkconfiguration.cpp b/src/network/bearer/qnetworkconfiguration.cpp index 4a576304f6..7d702b4a45 100644 --- a/src/network/bearer/qnetworkconfiguration.cpp +++ b/src/network/bearer/qnetworkconfiguration.cpp @@ -506,4 +506,8 @@ QString QNetworkConfiguration::bearerTypeName() const return QLatin1String("Unknown"); } +QList<QHostAddress> QNetworkConfigurationPrivate::hostIPAddresses(const QNetworkConfiguration &conf) { + return conf.d->hostAddresses; +} + QT_END_NAMESPACE diff --git a/src/network/bearer/qnetworkconfiguration_p.h b/src/network/bearer/qnetworkconfiguration_p.h index b69ce875ee..408a97a9b3 100644 --- a/src/network/bearer/qnetworkconfiguration_p.h +++ b/src/network/bearer/qnetworkconfiguration_p.h @@ -58,6 +58,7 @@ #include <QtCore/qshareddata.h> #include <QtCore/qmutex.h> #include <QtCore/qmap.h> +#include <QtNetwork/qhostaddress.h> #ifdef Q_OS_BLACKBERRY #include <bps/netstatus.h> @@ -101,6 +102,7 @@ public: QNetworkConfiguration::Type type; QNetworkConfiguration::Purpose purpose; QNetworkConfiguration::BearerType bearerType; + QList<QHostAddress> hostAddresses; #ifdef Q_OS_BLACKBERRY netstatus_ip_status_t oldIpStatus; @@ -109,6 +111,7 @@ public: bool isValid; bool roamingSupported; + static QList<QHostAddress> hostIPAddresses(const QNetworkConfiguration &conf); // ### Qt5: make public private: Q_DISABLE_COPY(QNetworkConfigurationPrivate) }; |