diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-20 21:22:53 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-20 21:22:53 +0200 |
| commit | 6f45fda50b6dbb0704a71a15f38d44027b4b1816 (patch) | |
| tree | 6a1c511cf233f1723c2b1758647f06c3bdaca7fb /src/network | |
| parent | 7ee44dcb9c5c4ffaba0043d7d58e0d43ccc06195 (diff) | |
| parent | ab6cc41968ec6eedd16e4305cf38ef937b2a8d56 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I0bea38585382b5d9c8d7a013bf6bcb3a6008d159
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/kernel/qnetworkinterface_linux.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/network/kernel/qnetworkinterface_linux.cpp b/src/network/kernel/qnetworkinterface_linux.cpp index 5dc62bf7bb..23ed2e0e15 100644 --- a/src/network/kernel/qnetworkinterface_linux.cpp +++ b/src/network/kernel/qnetworkinterface_linux.cpp @@ -41,6 +41,8 @@ #include "qnetworkinterface_p.h" #include "qnetworkinterface_unix_p.h" +#ifndef QT_NO_NETWORKINTERFACE + #include <qendian.h> #include <qobjectdefs.h> #include <qvarlengtharray.h> @@ -448,3 +450,5 @@ QList<QNetworkInterfacePrivate *> QNetworkInterfaceManager::scan() } QT_END_NAMESPACE + +#endif // QT_NO_NETWORKINTERFACE |