diff options
author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-03-25 00:56:37 (GMT) |
---|---|---|
committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-03-25 05:53:00 (GMT) |
commit | 3ccbfc46ef2647421608522aa38c12958e4ea3c3 (patch) | |
tree | 874721600ffa38985ee99a98b6ce5043eae122a3 /src/plugins/bearer/qnetworksession_impl.cpp | |
parent | af5501d2bef7242d3949d639e2bab7e326654bb2 (diff) | |
download | Qt-3ccbfc46ef2647421608522aa38c12958e4ea3c3.zip Qt-3ccbfc46ef2647421608522aa38c12958e4ea3c3.tar.gz Qt-3ccbfc46ef2647421608522aa38c12958e4ea3c3.tar.bz2 |
Compile with QT_NO_NETWORKINTERFACE defined.
Diffstat (limited to 'src/plugins/bearer/qnetworksession_impl.cpp')
-rw-r--r-- | src/plugins/bearer/qnetworksession_impl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/bearer/qnetworksession_impl.cpp b/src/plugins/bearer/qnetworksession_impl.cpp index db1759c..33cce69 100644 --- a/src/plugins/bearer/qnetworksession_impl.cpp +++ b/src/plugins/bearer/qnetworksession_impl.cpp @@ -49,8 +49,6 @@ #include <QtCore/qdebug.h> #include <QtCore/qmutex.h> -#include <QtNetwork/qnetworkinterface.h> - QT_BEGIN_NAMESPACE static QBearerEngineImpl *getEngineFromId(const QString &id) @@ -218,6 +216,7 @@ void QNetworkSessionPrivateImpl::reject() { } +#ifndef QT_NO_NETWORKINTERFACE QNetworkInterface QNetworkSessionPrivateImpl::currentInterface() const { if (!publicConfig.isValid() || !engine || state != QNetworkSession::Connected) @@ -229,6 +228,7 @@ QNetworkInterface QNetworkSessionPrivateImpl::currentInterface() const return QNetworkInterface(); return QNetworkInterface::interfaceFromName(interface); } +#endif QVariant QNetworkSessionPrivateImpl::sessionProperty(const QString &key) const { |