diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-05-11 12:35:53 +0200 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-05-11 12:35:53 +0200 |
| commit | a2ccdc36d0e80f7274ed0551c819bedcddc2f4cc (patch) | |
| tree | 55a19156916f0668770edcec8a479609963d1779 /mkspecs | |
| parent | 540092f4cc35238c258bb6422912d3eb18b26f33 (diff) | |
| parent | 5299240db14579960358edeebfc72fcef905af13 (diff) | |
Merge branch '4.5'
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/mac-g++.conf | 8 | ||||
| -rw-r--r-- | mkspecs/macx-g++/qmake.conf | 4 | ||||
| -rw-r--r-- | mkspecs/macx-g++42/qmake.conf | 5 |
3 files changed, 8 insertions, 9 deletions
diff --git a/mkspecs/common/mac-g++.conf b/mkspecs/common/mac-g++.conf index 287f1158f..dca2e2f8f 100644 --- a/mkspecs/common/mac-g++.conf +++ b/mkspecs/common/mac-g++.conf @@ -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 += diff --git a/mkspecs/macx-g++/qmake.conf b/mkspecs/macx-g++/qmake.conf index 64ef80182..43550737e 100644 --- a/mkspecs/macx-g++/qmake.conf +++ b/mkspecs/macx-g++/qmake.conf @@ -12,9 +12,9 @@ CONFIG += qt warn_on release app_bundle incremental global_init_link_order lib QT += core gui QMAKE_INCREMENTAL_STYLE = sublib -include(../common/mac-g++.conf) - QMAKE_CC = gcc QMAKE_CXX = g++ +include(../common/mac-g++.conf) + load(qt_config) diff --git a/mkspecs/macx-g++42/qmake.conf b/mkspecs/macx-g++42/qmake.conf index e6a31203f..06bbdcbb1 100644 --- a/mkspecs/macx-g++42/qmake.conf +++ b/mkspecs/macx-g++42/qmake.conf @@ -12,10 +12,9 @@ CONFIG += qt warn_on release app_bundle incremental global_init_link_order lib QT += core gui QMAKE_INCREMENTAL_STYLE = sublib -include(../common/mac-g++.conf) - - QMAKE_CC = gcc-4.2 QMAKE_CXX = g++-4.2 +include(../common/mac-g++.conf) + load(qt_config) |