From 9f5474536274e2db1ac6359911637fb29710bbc5 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Tue, 20 Mar 2018 10:15:23 +0100 Subject: 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 Reviewed-by: Thiago Macieira Reviewed-by: BogDan Vatra --- mkspecs/android-clang/qmake.conf | 3 +-- mkspecs/android-g++/qmake.conf | 3 --- mkspecs/common/android-base-tail.conf | 10 +--------- 3 files changed, 2 insertions(+), 14 deletions(-) (limited to 'mkspecs') diff --git a/mkspecs/android-clang/qmake.conf b/mkspecs/android-clang/qmake.conf index fae2c8ebd9..b665000d00 100644 --- a/mkspecs/android-clang/qmake.conf +++ b/mkspecs/android-clang/qmake.conf @@ -42,7 +42,6 @@ ANDROID_SOURCES_CXX_STL_LIBDIR = $$NDK_ROOT/sources/cxx-stl/llvm-libc++/libs/$$A ANDROID_STDCPP_PATH = $$ANDROID_SOURCES_CXX_STL_LIBDIR/libc++_shared.so ANDROID_CXX_STL_LIBS = -lc++ -QMAKE_ARM_CFLAGS_RELEASE = -Oz -QMAKE_ARM_CFLAGS_RELEASE_WITH_DEBUGINFO = -g -Oz +QMAKE_CFLAGS_OPTIMIZE_SIZE = -Oz include(../common/android-base-tail.conf) diff --git a/mkspecs/android-g++/qmake.conf b/mkspecs/android-g++/qmake.conf index c8145ae66b..e72c802405 100644 --- a/mkspecs/android-g++/qmake.conf +++ b/mkspecs/android-g++/qmake.conf @@ -31,7 +31,4 @@ else: \ LIBGCC_PATH_FULL = $$system("$$QMAKE_CXX -print-libgcc-file-name") ANDROID_SOURCES_CXX_STL_LIBDIR += $$dirname(LIBGCC_PATH_FULL) -QMAKE_ARM_CFLAGS_RELEASE = -Os -QMAKE_ARM_CFLAGS_RELEASE_WITH_DEBUGINFO = -g -Os - include(../common/android-base-tail.conf) 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 -- cgit v1.2.3