diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-03-20 10:15:23 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-04-14 17:23:25 +0000 |
| commit | 9f5474536274e2db1ac6359911637fb29710bbc5 (patch) | |
| tree | f203427f38b1b3bdfa3d6968e6bf59911c8278d9 /mkspecs/common | |
| parent | d5ac11891d8237ca2f02390ffd0ff103578b520e (diff) | |
Use optimize_size instead of duplicating similar logic
The android mkspecs had their own way of doing the same as optimize_size
Change-Id: Id05822df6bdeb8b3aafada2901bd61530c490fe9
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Diffstat (limited to 'mkspecs/common')
| -rw-r--r-- | mkspecs/common/android-base-tail.conf | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/mkspecs/common/android-base-tail.conf b/mkspecs/common/android-base-tail.conf index 160caf011f..7c3ae9566a 100644 --- a/mkspecs/common/android-base-tail.conf +++ b/mkspecs/common/android-base-tail.conf @@ -14,8 +14,7 @@ else: equals(ANDROID_TARGET_ARCH, armeabi): \ QMAKE_CFLAGS_WARN_ON = -Wall -W QMAKE_CFLAGS_WARN_OFF = equals(ANDROID_TARGET_ARCH, armeabi-v7a) | equals(ANDROID_TARGET_ARCH, armeabi) { - QMAKE_CFLAGS_RELEASE = $$QMAKE_ARM_CFLAGS_RELEASE - QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO = $$QMAKE_ARM_CFLAGS_RELEASE_WITH_DEBUGINFO + CONFIG += optimize_size QMAKE_CFLAGS_DEBUG = -g -marm -O0 equals(ANDROID_TARGET_ARCH, armeabi):if(equals(NDK_TOOLCHAIN_VERSION, 4.8)|equals(NDK_TOOLCHAIN_VERSION, 4.9)) { DEFINES += QT_OS_ANDROID_GCC_48_WORKAROUND @@ -23,13 +22,6 @@ equals(ANDROID_TARGET_ARCH, armeabi-v7a) | equals(ANDROID_TARGET_ARCH, armeabi) QMAKE_CFLAGS_RELEASE += -mthumb QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -mthumb } - - # Don't override our options with -O3 - QMAKE_CFLAGS_OPTIMIZE_FULL = -} else { - QMAKE_CFLAGS_RELEASE = -O2 - QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO = -g -O2 - QMAKE_CFLAGS_DEBUG = -g } QMAKE_CFLAGS_SHLIB = -fPIC |