diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-02 03:01:03 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-02 03:01:04 +0100 |
| commit | dc70c4c650b9a0ece63bb8334d1b4e7d7b09818e (patch) | |
| tree | c67604a780dfb147ac9040d6ad8ccae333d7c11b /src | |
| parent | e6a5786518d1a722611516e478aca6e0feea2b42 (diff) | |
| parent | b43e8fa213ae54a09f5ddb6ce847bcbefcd0dfe6 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta1v5.13.0-alpha1
Change-Id: I3931aca16393acc9c698dcf018801e1d031004bc
Diffstat (limited to 'src')
| -rw-r--r-- | src/serialport/qserialport_unix.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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 */ |