diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2022-08-02 18:18:53 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2022-08-04 03:35:36 +0200 |
| commit | 8669949f0df98610d9e4ce71cb80368357cd78ea (patch) | |
| tree | ad4a3dcd5259d90035cc21514ab69b28c2f242b6 /src/network/kernel | |
| parent | 651092c218bb2d3b2584d6feabdf4df9ebe512d1 (diff) | |
Remove if_types.h workaround for watchOS
watchOS is no longer supported, nor should the workaround be necessary
anymore.
Pick-to: 6.4 6.3 6.2
Change-Id: Id5898d14b10e8f4aeaf6ce42ab39dbfdff9338ef
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'src/network/kernel')
| -rw-r--r-- | src/network/kernel/qnetworkinterface_uikit_p.h | 21 | ||||
| -rw-r--r-- | src/network/kernel/qnetworkinterface_unix.cpp | 3 |
2 files changed, 0 insertions, 24 deletions
diff --git a/src/network/kernel/qnetworkinterface_uikit_p.h b/src/network/kernel/qnetworkinterface_uikit_p.h index 3728eac50c..49e2db007b 100644 --- a/src/network/kernel/qnetworkinterface_uikit_p.h +++ b/src/network/kernel/qnetworkinterface_uikit_p.h @@ -201,26 +201,5 @@ struct in6_ifreq { #define SIOCGIFAFLAG_IN6 _IOWR('i', 73, struct in6_ifreq) #define SIOCGIFALIFETIME_IN6 _IOWR('i', 81, struct in6_ifreq) -// The definition below is ONLY a temporary workaround to unblock -// integrations on CI. MUST be removed ASAP, as soon as SDK is -// updated. Currently, we have WatchOS SDK 3.2 and it's missing -// net/if_types.h (unlike SDK 4.0, which has it). Alas, we have to -// work this around. We only define constants that we use in code. - -#if !QT_DARWIN_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_NA, __IPHONE_NA, __TVOS_NA, __WATCHOS_4_0) - -#define QT_WATCHOS_OUTDATED_SDK_WORKAROUND - -#define IFT_PPP 0x17 /* RFC 1331 */ -#define IFT_LOOP 0x18 /* loopback */ -#define IFT_SLIP 0x1c /* IP over generic TTY */ - -#define IFT_GIF 0x37 /*0xf0*/ -#define IFT_STF 0x39 /*0xf3*/ - -#define IFT_IEEE1394 0x90 /* IEEE1394 High Performance SerialBus*/ - -#endif // WatchOS SDK below 4.0 - #endif // QNETWORKINTERFACE_UIKIT_P_H diff --git a/src/network/kernel/qnetworkinterface_unix.cpp b/src/network/kernel/qnetworkinterface_unix.cpp index 20af235de5..51a266b2e3 100644 --- a/src/network/kernel/qnetworkinterface_unix.cpp +++ b/src/network/kernel/qnetworkinterface_unix.cpp @@ -382,10 +382,7 @@ QT_BEGIN_INCLUDE_NAMESPACE # include <net/if_dl.h> #if defined(QT_PLATFORM_UIKIT) # include "qnetworkinterface_uikit_p.h" -#if !defined(QT_WATCHOS_OUTDATED_SDK_WORKAROUND) -// TODO: remove it as soon as SDK is updated on CI!!! # include <net/if_types.h> -#endif #else # include <net/if_media.h> # include <net/if_types.h> |