Compile with QT_NO_NETWORKINTERFACE defined.

5 files changed, 7 insertions, 3 deletions

diff --git a/src/network/bearer/qnetworkconfigmanager_p.h b/src/network/bearer/qnetworkconfigmanager_p.h
index 8ec8152..dba9d2c 100644
--- a/src/network/bearer/qnetworkconfigmanager_p.h
+++ b/src/network/bearer/qnetworkconfigmanager_p.h
@@ -57,6 +57,7 @@
 #include "qnetworkconfiguration_p.h"
 
 #include <QtCore/qmutex.h>
+#include <QtCore/qset.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/network/bearer/qnetworkconfiguration_p.h b/src/network/bearer/qnetworkconfiguration_p.h
index 07b472e..ccbe670 100644
--- a/src/network/bearer/qnetworkconfiguration_p.h
+++ b/src/network/bearer/qnetworkconfiguration_p.h
@@ -57,7 +57,6 @@
 
 #include <QtCore/qshareddata.h>
 #include <QtCore/qmutex.h>
-#include <QtNetwork/QNetworkInterface>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/network/bearer/qnetworksession.cpp b/src/network/bearer/qnetworksession.cpp
index ca21dcd..1bba56f 100644
--- a/src/network/bearer/qnetworksession.cpp
+++ b/src/network/bearer/qnetworksession.cpp
@@ -370,6 +370,7 @@ QNetworkConfiguration QNetworkSession::configuration() const
     return d ? d->publicConfig : QNetworkConfiguration();
 }
 
+#ifndef QT_NO_NETWORKINTERFACE
 /*!
     Returns the network interface that is used by this session.
 
@@ -386,6 +387,7 @@ QNetworkInterface QNetworkSession::interface() const
 {
     return d ? d->currentInterface() : QNetworkInterface();
 }
+#endif
 
 /*!
     Returns true if this session is open. If the number of all open sessions is greater than
diff --git a/src/network/bearer/qnetworksession.h b/src/network/bearer/qnetworksession.h
index 1f25088..596f527 100644
--- a/src/network/bearer/qnetworksession.h
+++ b/src/network/bearer/qnetworksession.h
@@ -86,7 +86,9 @@ public:
 
     bool isOpen() const;
     QNetworkConfiguration configuration() const;
+#ifndef QT_NO_NETWORKINTERFACE
     QNetworkInterface interface() const;
+#endif
 
     State state() const;
     SessionError error() const;
diff --git a/src/network/bearer/qnetworksession_p.h b/src/network/bearer/qnetworksession_p.h
index 76691b3..a341eaf 100644
--- a/src/network/bearer/qnetworksession_p.h
+++ b/src/network/bearer/qnetworksession_p.h
@@ -56,8 +56,6 @@
 #include "qnetworksession.h"
 #include "qnetworkconfiguration_p.h"
 
-#include <QNetworkInterface>
-
 QT_BEGIN_NAMESPACE
 
 class Q_NETWORK_EXPORT QNetworkSessionPrivate : public QObject
@@ -82,7 +80,9 @@ public:
     //notification hooks to discover future state changes.
     virtual void syncStateWithInterface() = 0;
 
+#ifndef QT_NO_NETWORKINTERFACE
     virtual QNetworkInterface currentInterface() const = 0;
+#endif
     virtual QVariant sessionProperty(const QString& key) const = 0;
     virtual void setSessionProperty(const QString& key, const QVariant& value) = 0;