summaryrefslogtreecommitdiffstats
path: root/mkspecs/common/mac-g++.conf
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-05-12 23:07:35 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-05-12 23:07:35 (GMT)
commit1d11153b5564deb06d9f2936e0e43a0700a0e359 (patch)
tree02a2bf1f770417787bc16a8b6f480065b64fea35 /mkspecs/common/mac-g++.conf
parentb5423af0511f24c8648cb0f4e8e8a2eaef0f27fc (diff)
parenta47bf3d15b589414183a0aa51c710c3763d3d1d1 (diff)
downloadQt-1d11153b5564deb06d9f2936e0e43a0700a0e359.zip
Qt-1d11153b5564deb06d9f2936e0e43a0700a0e359.tar.gz
Qt-1d11153b5564deb06d9f2936e0e43a0700a0e359.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'mkspecs/common/mac-g++.conf')
-rw-r--r--mkspecs/common/mac-g++.conf10
1 files changed, 5 insertions, 5 deletions
diff --git a/mkspecs/common/mac-g++.conf b/mkspecs/common/mac-g++.conf
index b764b26..dca2e2f 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
@@ -46,10 +46,10 @@ QMAKE_CXXFLAGS_DWARF2 += $$QMAKE_CFLAGS_DWARF2
QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
-QMAKE_LINK = g++
-QMAKE_LINK_SHLIB = g++
-QMAKE_LINK_C = gcc
-QMAKE_LINK_C_SHLIB = gcc
+QMAKE_LINK = $$QMAKE_CXX
+QMAKE_LINK_SHLIB = $$QMAKE_CXX
+QMAKE_LINK_C = $$QMAKE_CC
+QMAKE_LINK_C_SHLIB = $$QMAKE_CC
QMAKE_LFLAGS += -headerpad_max_install_names
QMAKE_LFLAGS_RELEASE +=
QMAKE_LFLAGS_DEBUG +=