android-qt: fix build for jellybean

Change-Id: I2a52770502ec6e70ae0e3928d98c6c573f773579
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>

diff --git a/mkspecs/unsupported/android-g++/qmake.conf b/mkspecs/unsupported/android-g++/qmake.conf
index 54e6d61..3fc278b 100644 (file)
--- a/mkspecs/unsupported/android-g++/qmake.conf
+++ b/mkspecs/unsupported/android-g++/qmake.conf
@@ -41,9 +41,11 @@ include(../../common/gcc-base-unix.conf)
 
 CONFIG                  = qt warn_on release link_prl
 QT                      = core gui
-DEFINES                += Q_OS_LINUX_ANDROID ANDROID HAVE_ANDROID_OS
+DEFINES                += Q_OS_LINUX_ANDROID HAVE_ANDROID_OS
 DEFINES                += QT_NO_PRINTER QT_NO_PRINTDIALOG QT_NO_EXCEPTIONS
 
+#note: -DANDROID results in weird behaviour of math.h
+DEFINES                += ANDROID
 
 QT_QPA_DEFAULT_PLATFORM = eglfs
 EGLFS_PLATFORM_HOOKS_SOURCES  = $$PWD/qeglfshooks_surfaceflinger.cpp
@@ -53,6 +55,8 @@ EGLFS_PLATFORM_HOOKS_LIBS    += -lgui -lutils
 QMAKE_CC                = $${ANDROID_TOOLCHAIN_PREFIX}gcc
 
 QMAKE_CFLAGS            = $${ANDROID_TARGET_CFLAGS}
+QMAKE_CFLAGS           -= -Werror=non-virtual-dtor
+QMAKE_CFLAGS           -= -DNDEBUG
 
 QMAKE_CFLAGS_WARN_ON    = -Wall -Wextra
 QMAKE_CFLAGS_WARN_OFF   = -Wno-psabi