From 499f9b2abfabacd254e1b23566343ac20322eb48 Mon Sep 17 00:00:00 2001 From: Aleix Pol Date: Sat, 12 Sep 2015 10:28:55 +0200 Subject: [PATCH] Use the proper macro to detect the compiler as part of the NDK The correct macros can be easily checked by running: .../arm-linux-androideabi-gcc -E -dM - < /dev/null | grep -i ANDR Otherwise we're just relying on the user to set up explicitly the toolchain to target Android Change-Id: I7b68521f43031c13da99b07626360d0702bff4ca Reviewed-by: BogDan Vatra --- src/corelib/global/qsystemdetection.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/global/qsystemdetection.h b/src/corelib/global/qsystemdetection.h index 562427e4b9..d19784163a 100644 --- a/src/corelib/global/qsystemdetection.h +++ b/src/corelib/global/qsystemdetection.h @@ -94,7 +94,7 @@ # else # define Q_OS_DARWIN32 # endif -#elif defined(ANDROID) +#elif defined(__ANDROID__) || defined(ANDROID) # define Q_OS_ANDROID # define Q_OS_LINUX #elif defined(__CYGWIN__)