diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-06-24 21:16:41 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-06-24 21:16:41 (GMT) |
| commit | fd5c6436d4be5ce6db57a8a34951c8ab4dac9000 (patch) | |
| tree | 2b2ce0df9cd0bfcc1c8a0566668c92df8be94206 /mkspecs | |
| parent | 117b9bb3d576d9974b3d05174d1fccf98e47cb22 (diff) | |
| parent | 5f5cf5b798cc7e65e47987b654beaf9d762406eb (diff) | |
| download | Qt-fd5c6436d4be5ce6db57a8a34951c8ab4dac9000.zip Qt-fd5c6436d4be5ce6db57a8a34951c8ab4dac9000.tar.gz Qt-fd5c6436d4be5ce6db57a8a34951c8ab4dac9000.tar.bz2 | |
Merge branch '4.5'
Conflicts:
tests/auto/qsqldatabase/tst_databases.h
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/mac-llvm.conf | 4 | ||||
| -rw-r--r-- | mkspecs/macx-llvm/qmake.conf | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/mkspecs/common/mac-llvm.conf b/mkspecs/common/mac-llvm.conf index 624aec4..55850c6 100644 --- a/mkspecs/common/mac-llvm.conf +++ b/mkspecs/common/mac-llvm.conf @@ -48,8 +48,8 @@ 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 = llvm-g++ -QMAKE_LINK_SHLIB = llvm-g++ +QMAKE_LINK = $$QMAKE_CXX +QMAKE_LINK_SHLIB = $$QMAKE_CXX QMAKE_LFLAGS += -headerpad_max_install_names QMAKE_LFLAGS_RELEASE += QMAKE_LFLAGS_DEBUG += diff --git a/mkspecs/macx-llvm/qmake.conf b/mkspecs/macx-llvm/qmake.conf index cb8aaa1..de8040c 100644 --- a/mkspecs/macx-llvm/qmake.conf +++ b/mkspecs/macx-llvm/qmake.conf @@ -14,6 +14,4 @@ QMAKE_INCREMENTAL_STYLE = sublib include(../common/mac-llvm.conf) -QMAKE_OBJECTIVE_CC = gcc - load(qt_config) |