diff options
author | Andy Shaw <andy.shaw@digia.com> | 2012-01-26 22:36:42 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-01 00:09:57 +0100 |
commit | 221fe8776b4b156dcdf654e1fc5ab0a1e63cfeab (patch) | |
tree | c67332dfb72ef5103289609e5424528e9c31e15e /mkspecs/macx-xcode | |
parent | 46e4a9d5231e2d9e35424259858713ca539b8e30 (diff) |
Add support for XCode 4 into qmake
This adds support for XCode 4 into qmake and also indirectly fixes a
couple of problems that are relevant for XCode 3.2 too
Task-number: QTBUG-17247
Change-Id: I722470ad1854bd740cbbd28ff4956057a0e1906b
Reviewed-by: David Forstenlechner <dforsten@gmail.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
(cherry picked from commit b5871311457ca97816c0abbb8b935570bbfb657c)
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'mkspecs/macx-xcode')
-rw-r--r-- | mkspecs/macx-xcode/qmake.conf | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mkspecs/macx-xcode/qmake.conf b/mkspecs/macx-xcode/qmake.conf index 4cb462696e..de14562039 100644 --- a/mkspecs/macx-xcode/qmake.conf +++ b/mkspecs/macx-xcode/qmake.conf @@ -13,8 +13,6 @@ include(../common/mac.conf) include(../common/gcc-base-macx.conf) include(../common/g++-macx.conf) -QMAKE_CC = -QMAKE_CXX = QMAKE_LINK = QMAKE_LINK_C = QMAKE_LINK_C_SHLIB = |