diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-04-20 12:21:57 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-04-20 12:21:57 +0200 |
| commit | cf204590ea94bb3a191b5e783471bd6f5a04ab8e (patch) | |
| tree | f96b4dc4c3995b0a3a2d1b8291144846c30baa64 /src/network/kernel/qnetworkinterface_linux.cpp | |
| parent | c579a77f841ed44df25553972f8807110c55808d (diff) | |
| parent | 941db4e0bb3170b6bc3cf775f150a226754e6285 (diff) | |
Merge 5.11 into 5.11.0
Change-Id: I11c61dc1259ed66d871ecab2666085ccf37a9342
Diffstat (limited to 'src/network/kernel/qnetworkinterface_linux.cpp')
| -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 |