diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | qtserialport.pro | 1 | ||||
| -rw-r--r-- | src/serialport/qserialport_unix.cpp | 4 |
3 files changed, 3 insertions, 4 deletions
diff --git a/.qmake.conf b/.qmake.conf index 1c14aab6..c954a094 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.12.1 +MODULE_VERSION = 5.12.2 diff --git a/qtserialport.pro b/qtserialport.pro index 3dabc4b6..5b7cd414 100644 --- a/qtserialport.pro +++ b/qtserialport.pro @@ -7,7 +7,6 @@ requires(!integrity) requires(!vxworks) requires(!winrt) requires(!uikit) -requires(!android) requires(!emscripten) load(configure) diff --git a/src/serialport/qserialport_unix.cpp b/src/serialport/qserialport_unix.cpp index dd0339fd..294782b5 100644 --- a/src/serialport/qserialport_unix.cpp +++ b/src/serialport/qserialport_unix.cpp @@ -70,10 +70,10 @@ # ifdef Q_OS_ANDROID # include <android/api-level.h> # else -# define __ANDROID_API__ 21 +# define __ANDROID_API__ 16 # endif -# if !defined(Q_OS_ANDROID) || (!defined(Q_PROCESSOR_X86) && __ANDROID_API__ < 21) +# if !defined(Q_OS_ANDROID) || (!defined(Q_PROCESSOR_X86) && __ANDROID_API__ < 16) struct termios2 { tcflag_t c_iflag; /* input mode flags */ tcflag_t c_oflag; /* output mode flags */ |