diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | qtserialport.pro | 2 | ||||
| -rw-r--r-- | src/serialport/qserialport_unix.cpp | 8 |
3 files changed, 9 insertions, 3 deletions
diff --git a/.qmake.conf b/.qmake.conf index fec66b7..b1c22d3 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.8.1 +MODULE_VERSION = 5.9.0 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 */ |