summaryrefslogtreecommitdiff
path: root/src/network/bearer/qnetworksession.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/network/bearer/qnetworksession.h')
-rw-r--r--src/network/bearer/qnetworksession.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/network/bearer/qnetworksession.h b/src/network/bearer/qnetworksession.h
index 18437f6c3e..596f527b11 100644
--- a/src/network/bearer/qnetworksession.h
+++ b/src/network/bearer/qnetworksession.h
@@ -48,6 +48,10 @@
#include <QtCore/qvariant.h>
#include <QtNetwork/qnetworkconfiguration.h>
+#if defined(Q_OS_WIN) && defined(interface)
+#undef interface
+#endif
+
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@@ -77,12 +81,14 @@ public:
InvalidConfigurationError
};
- QNetworkSession(const QNetworkConfiguration& connConfig, QObject* parent =0);
+ explicit QNetworkSession(const QNetworkConfiguration& connConfig, QObject* parent =0);
virtual ~QNetworkSession();
bool isOpen() const;
QNetworkConfiguration configuration() const;
+#ifndef QT_NO_NETWORKINTERFACE
QNetworkInterface interface() const;
+#endif
State state() const;
SessionError error() const;