diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-02-28 13:05:12 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-02-28 13:05:12 +0100 |
| commit | 8d7f133ed22bbb10274e4a9f166bd97325228955 (patch) | |
| tree | 6b9ebc99a7491bc8c8de695f77b2ae6c8474bb0b | |
| parent | 4a6b4d29acad2ca1b1b96d87a11afb1f8e802240 (diff) | |
| parent | 1340fedecd841765485beffa7c93320c96f21cdc (diff) | |
| download | qtserialport-8d7f133ed22bbb10274e4a9f166bd97325228955.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: Ie98fd0ed952ab6d863b02b5de1e93a205871b6db
| -rw-r--r-- | qtserialport.pro | 2 | ||||
| -rw-r--r-- | src/serialport/qserialport_unix.cpp | 8 |
2 files changed, 8 insertions, 2 deletions
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) 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 */ |