diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-17 11:02:54 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-17 11:02:54 +0200 |
| commit | d90b155c6034bc16a9eb2d5794f101cde4ea9e2c (patch) | |
| tree | e648b8db6b9e8e8d7f0c765ac2953b066524eb49 /src/network/bearer | |
| parent | b00565bc2803bb783e8f2b0d02becfa73323e283 (diff) | |
| parent | d71bb504a635b51a85f3ccd919e0d77f869e50a8 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
mkspecs/macx-ios-clang/features/resolve_config.prf
src/testlib/qtestcase.qdoc
Change-Id: Icefa63056ffb37106f35299a8f19165535571799
Diffstat (limited to 'src/network/bearer')
| -rw-r--r-- | src/network/bearer/qnetworksession.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/network/bearer/qnetworksession.cpp b/src/network/bearer/qnetworksession.cpp index 6d864a7d3e..2ad46918b2 100644 --- a/src/network/bearer/qnetworksession.cpp +++ b/src/network/bearer/qnetworksession.cpp @@ -48,6 +48,11 @@ #include "qnetworkconfigmanager_p.h" +// for QNetworkSession::interface +#ifdef interface +# undef interface +#endif + #ifndef QT_NO_BEARERMANAGEMENT QT_BEGIN_NAMESPACE |