From d07ea0efbc0dc2d1bf2341d377bb81d0b239967d Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Tue, 21 Nov 2017 16:15:44 +0100 Subject: A temporary fix for CI: define macros from the missing if_types.h One of our CI machines has WatchOS SDK 3.2 which is missing net/if_types.h. This block integrations and until SDK is updated in VM, we provide the missing macros from if_types.h. To be removed ASAP. Task-number: QTBUG-64447 Change-Id: I202d3313b9a6a6d7bd29670f0bffc182d4660f81 Reviewed-by: Thiago Macieira Reviewed-by: Jake Petroules --- src/network/kernel/qnetworkinterface_unix.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/network/kernel/qnetworkinterface_unix.cpp') diff --git a/src/network/kernel/qnetworkinterface_unix.cpp b/src/network/kernel/qnetworkinterface_unix.cpp index 078b8dd1434..30bb37319bb 100644 --- a/src/network/kernel/qnetworkinterface_unix.cpp +++ b/src/network/kernel/qnetworkinterface_unix.cpp @@ -405,11 +405,15 @@ static void getAddressExtraInfo(QNetworkAddressEntry *entry, struct sockaddr *sa # elif defined(Q_OS_BSD4) QT_BEGIN_INCLUDE_NAMESPACE # include -# include #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 +#endif #else # include +# include # include #endif // QT_PLATFORM_UIKIT QT_END_INCLUDE_NAMESPACE -- cgit v1.2.3