summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorten Sørvig <msorvig@trolltech.com>2009-05-08 07:51:15 (GMT)
committerMorten Sørvig <msorvig@trolltech.com>2009-05-08 07:51:15 (GMT)
commit9ffcf3737901c49acb1a1bc6b65572d195d78a5d (patch)
treece3bedd0fdb577062ed895fdee69ddd3d1cdd81d
parent5a4b17a279aaa8a0196bd645fd9095639ccb7849 (diff)
downloadQt-9ffcf3737901c49acb1a1bc6b65572d195d78a5d.zip
Qt-9ffcf3737901c49acb1a1bc6b65572d195d78a5d.tar.gz
Qt-9ffcf3737901c49acb1a1bc6b65572d195d78a5d.tar.bz2
Make the g++-42 mkspec use gcc-4.2 for linking as well.
Forgot to override the linker, causing it to use gcc 4.0. Reviewed-by: Richard Moe Gustavsen
-rw-r--r--mkspecs/macx-g++42/qmake.conf8
1 files changed, 6 insertions, 2 deletions
diff --git a/mkspecs/macx-g++42/qmake.conf b/mkspecs/macx-g++42/qmake.conf
index e6a3120..4c4f5c3 100644
--- a/mkspecs/macx-g++42/qmake.conf
+++ b/mkspecs/macx-g++42/qmake.conf
@@ -15,7 +15,11 @@ QMAKE_INCREMENTAL_STYLE = sublib
include(../common/mac-g++.conf)
-QMAKE_CC = gcc-4.2
-QMAKE_CXX = g++-4.2
+QMAKE_CC = gcc-4.2
+QMAKE_CXX = g++-4.2
+QMAKE_LINK = g++-4.2
+QMAKE_LINK_SHLIB = g++-4.2
+QMAKE_LINK_C = gcc-4.2
+QMAKE_LINK_C_SHLIB = gcc-4.2
load(qt_config)