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/icd | |
| 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/icd')
| -rw-r--r-- | src/plugins/bearer/icd/qnetworksession_impl.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/bearer/icd/qnetworksession_impl.h | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/plugins/bearer/icd/qnetworksession_impl.cpp b/src/plugins/bearer/icd/qnetworksession_impl.cpp index 06e0529..5bf95dc 100644 --- a/src/plugins/bearer/icd/qnetworksession_impl.cpp +++ b/src/plugins/bearer/icd/qnetworksession_impl.cpp @@ -1110,7 +1110,7 @@ void QNetworkSessionPrivateImpl::reject() { } - +#ifndef QT_NO_NETWORKINTERFACE QNetworkInterface QNetworkSessionPrivateImpl::currentInterface() const { if (!publicConfig.isValid() || state != QNetworkSession::Connected) @@ -1121,7 +1121,7 @@ QNetworkInterface QNetworkSessionPrivateImpl::currentInterface() const return QNetworkInterface::interfaceFromName(currentNetworkInterface); } - +#endif void QNetworkSessionPrivateImpl::setSessionProperty(const QString& key, const QVariant& value) { diff --git a/src/plugins/bearer/icd/qnetworksession_impl.h b/src/plugins/bearer/icd/qnetworksession_impl.h index 587e6dc..c02faac 100644 --- a/src/plugins/bearer/icd/qnetworksession_impl.h +++ b/src/plugins/bearer/icd/qnetworksession_impl.h @@ -56,11 +56,6 @@ #include <QtNetwork/private/qnetworksession_p.h> #include <QtNetwork/qnetworkconfigmanager.h> -//#include "qnetworkconfigmanager_maemo_p.h" -//#include "qnetworksession.h" - -//#include <qnetworksession.h> -//#include <QNetworkInterface> #include <QtCore/qdatetime.h> #include <icd/dbus_api.h> @@ -90,7 +85,9 @@ public: //notification hooks to discover future state changes. void syncStateWithInterface(); +#ifndef QT_NO_NETWORKINTERFACE QNetworkInterface currentInterface() const; +#endif QVariant sessionProperty(const QString& key) const; void setSessionProperty(const QString& key, const QVariant& value); |