14 lines
814 B
Diff
14 lines
814 B
Diff
diff -uNr qt-everywhere-src-5.11.2/qtbase/src/corelib/global/qsystemdetection.h qt-everywhere-src-5.11.2.mod/qtbase/src/corelib/global/qsystemdetection.h
|
|
--- qt-everywhere-src-5.11.2/qtbase/src/corelib/global/qsystemdetection.h 2018-09-13 07:25:10.000000000 +0300
|
|
+++ qt-everywhere-src-5.11.2.mod/qtbase/src/corelib/global/qsystemdetection.h 2018-09-21 16:25:01.055329471 +0300
|
|
@@ -108,9 +108,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__))
|