diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@nokia.com> | 2010-11-02 14:23:04 (GMT) |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@nokia.com> | 2010-11-02 14:26:30 (GMT) |
| commit | a969cc4375186a6875ef450f042dad77f62ee3a8 (patch) | |
| tree | 7f932b991e5ebd831b43b5c3e298bd0f09bb2e18 /mkspecs/macx-g++42 | |
| parent | 0956624f7f20665fa4b789654a022a97cdda90c9 (diff) | |
| download | Qt-a969cc4375186a6875ef450f042dad77f62ee3a8.zip Qt-a969cc4375186a6875ef450f042dad77f62ee3a8.tar.gz Qt-a969cc4375186a6875ef450f042dad77f62ee3a8.tar.bz2 | |
Don't use scopes in mkspecs as configure does not support them
Configure has very basic parsing of mkspecs where it traverses
includes, but assumes that the last seen value is the right one.
Since this parsing does not take scopes into account we can't
use tricks like isEmpty().
Reviewed-by: ossi
Diffstat (limited to 'mkspecs/macx-g++42')
| -rw-r--r-- | mkspecs/macx-g++42/qmake.conf | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/mkspecs/macx-g++42/qmake.conf b/mkspecs/macx-g++42/qmake.conf index b2be5ed..3d31305 100644 --- a/mkspecs/macx-g++42/qmake.conf +++ b/mkspecs/macx-g++42/qmake.conf @@ -13,11 +13,16 @@ CONFIG += qt warn_on release app_bundle incremental global_init_link_order lib QT += core gui QMAKE_INCREMENTAL_STYLE = sublib -QMAKE_CC = gcc-4.2 -QMAKE_CXX = g++-4.2 - include(../common/mac.conf) include(../common/gcc-base-macx.conf) include(../common/g++-macx.conf) +QMAKE_CC = gcc-4.2 +QMAKE_CXX = g++-4.2 + +QMAKE_LINK = $$QMAKE_CXX +QMAKE_LINK_SHLIB = $$QMAKE_CXX +QMAKE_LINK_C = $$QMAKE_CC +QMAKE_LINK_C_SHLIB = $$QMAKE_CC + load(qt_config) |