From 34797c33207cebfba333fd711bd41798059212bd Mon Sep 17 00:00:00 2001
From: Jake Petroules <jake.petroules@qt.io>
Date: Mon, 13 Feb 2017 11:51:31 -0800
Subject: Exclude qtserialport build from tvOS and watchOS

If it doesn't work on iOS, it won't work on those platforms either.

Change-Id: Ie4109eda9ce83339435fb3e221e4bcbbeadac821
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
---
 qtserialport.pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qtserialport.pro b/qtserialport.pro
index 95eb99b..11859de 100644
--- a/qtserialport.pro
+++ b/qtserialport.pro
@@ -4,7 +4,7 @@ lessThan(QT_MAJOR_VERSION, 5) {
 }
 
 requires(!winrt)
-requires(!ios)
+requires(!uikit)
 
 load(configure)
 qtCompileTest(ntddmodm)
-- 
cgit v1.2.1


From 1340fedecd841765485beffa7c93320c96f21cdc Mon Sep 17 00:00:00 2001
From: BogDan Vatra <bogdan@kdab.com>
Date: Thu, 23 Feb 2017 11:18:16 +0200
Subject: Fix build with API >= 21

Change-Id: I77f015100f2b9ed5e1a16ebd1ba0b28216282085
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
---
 src/serialport/qserialport_unix.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/serialport/qserialport_unix.cpp b/src/serialport/qserialport_unix.cpp
index fafe8c5..8f9f087 100644
--- a/src/serialport/qserialport_unix.cpp
+++ b/src/serialport/qserialport_unix.cpp
@@ -60,7 +60,13 @@
 
 #ifdef Q_OS_LINUX
 
-# if !defined(Q_OS_ANDROID) || !defined(Q_PROCESSOR_X86)
+# ifdef Q_OS_ANDROID
+#  include <android/api-level.h>
+# else
+#  define __ANDROID_API__ 21
+# endif
+
+# if !defined(Q_OS_ANDROID) || (!defined(Q_PROCESSOR_X86) && __ANDROID_API__ < 21)
 struct termios2 {
     tcflag_t c_iflag;       /* input mode flags */
     tcflag_t c_oflag;       /* output mode flags */
-- 
cgit v1.2.1