diff options
| -rw-r--r-- | mkspecs/android-clang/qmake.conf | 3 | ||||
| -rw-r--r-- | mkspecs/android-g++/qmake.conf | 3 | ||||
| -rw-r--r-- | mkspecs/common/android-base-tail.conf | 10 |
3 files changed, 2 insertions, 14 deletions
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 |