diff options
| author | Morten Sørvig <msorvig@trolltech.com> | 2009-05-08 08:33:13 (GMT) |
|---|---|---|
| committer | Morten Sørvig <msorvig@trolltech.com> | 2009-05-08 08:33:13 (GMT) |
| commit | 04975e4a594af999600e175f65869f615f5e9740 (patch) | |
| tree | 4c3b91068d213850abf505e17fe7f5fa37754842 | |
| parent | a0fd01a518362f718e44bdb0eb7653b3db5bfa22 (diff) | |
| download | Qt-04975e4a594af999600e175f65869f615f5e9740.zip Qt-04975e4a594af999600e175f65869f615f5e9740.tar.gz Qt-04975e4a594af999600e175f65869f615f5e9740.tar.bz2 | |
Change optimization flags from Os to O2 for OS X applications.
Qt itself was O2 from 4.2 and up, this changes it for applications as well.
Reviewed-by: nrc
| -rw-r--r-- | mkspecs/common/mac-g++.conf | 2 | ||||
| -rw-r--r-- | src/qbase.pri | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/mkspecs/common/mac-g++.conf b/mkspecs/common/mac-g++.conf index b764b26..287f115 100644 --- a/mkspecs/common/mac-g++.conf +++ b/mkspecs/common/mac-g++.conf @@ -9,7 +9,7 @@ QMAKE_CFLAGS += -pipe QMAKE_CFLAGS_DEPS += -M QMAKE_CFLAGS_WARN_ON += -Wall -W QMAKE_CFLAGS_WARN_OFF += -w -QMAKE_CFLAGS_RELEASE += -Os +QMAKE_CFLAGS_RELEASE += -O2 QMAKE_CFLAGS_DEBUG += -g QMAKE_CFLAGS_SHLIB += -fPIC QMAKE_CFLAGS_STATIC_LIB += -fPIC diff --git a/src/qbase.pri b/src/qbase.pri index 9ba8e70..0ab04e6 100644 --- a/src/qbase.pri +++ b/src/qbase.pri @@ -67,11 +67,6 @@ mac:!static:contains(QT_CONFIG, qt_framework) { mac { CONFIG += explicitlib - true { #we want to use O2 on Qt itself (Os was used to fix other failures in older GCC) - QMAKE_CFLAGS_RELEASE ~= s,-Os,-O2, - QMAKE_CXXFLAGS_RELEASE ~= s,-Os,-O2, - QMAKE_OBJECTIVE_CFLAGS_RELEASE ~= s,-Os,-O2, - } macx-g++ { QMAKE_CFLAGS += -fconstant-cfstrings QMAKE_CXXFLAGS += -fconstant-cfstrings |