| 1 | --- ./qtbase/src/corelib/global/qsystemdetection.h 2017-06-28 15:24:29.000000000 +0530 |
| 2 | +++ ../qsystemdetection.h 2017-07-19 19:39:39.617805768 +0530 |
| 3 | @@ -120,9 +120,6 @@ |
| 4 | # else |
| 5 | # error "Qt has not been ported to this Apple platform - see http://www.qt.io/developers" |
| 6 | # endif |
| 7 | -#elif defined(__ANDROID__) || defined(ANDROID) |
| 8 | -# define Q_OS_ANDROID |
| 9 | -# define Q_OS_LINUX |
| 10 | #elif defined(__CYGWIN__) |
| 11 | # define Q_OS_CYGWIN |
| 12 | #elif !defined(SAG_COM) && (!defined(WINAPI_FAMILY) || WINAPI_FAMILY==WINAPI_FAMILY_DESKTOP_APP) && (defined(WIN64) || defined(_WIN64) || defined(__WIN64__)) |