You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
12 lines
585 B
12 lines
585 B
--- ./qtbase/src/corelib/global/qsystemdetection.h 2017-06-28 15:24:29.000000000 +0530
|
|
+++ ../qsystemdetection.h 2017-07-19 19:39:39.617805768 +0530
|
|
@@ -120,9 +120,6 @@
|
|
# else
|
|
# error "Qt has not been ported to this Apple platform - see http://www.qt.io/developers"
|
|
# endif
|
|
-#elif defined(__ANDROID__) || defined(ANDROID)
|
|
-# define Q_OS_ANDROID
|
|
-# define Q_OS_LINUX
|
|
#elif defined(__CYGWIN__)
|
|
# define Q_OS_CYGWIN
|
|
#elif !defined(SAG_COM) && (!defined(WINAPI_FAMILY) || WINAPI_FAMILY==WINAPI_FAMILY_DESKTOP_APP) && (defined(WIN64) || defined(_WIN64) || defined(__WIN64__))
|
|
|