diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@nokia.com> | 2010-11-05 14:54:54 (GMT) |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@nokia.com> | 2010-11-05 14:59:12 (GMT) |
| commit | 3d1b93ce6a48ee4c305c052e165e7b16f6326bd1 (patch) | |
| tree | 6e0c82be229f830774daeb6ca3de612e5beaa0a1 /mkspecs/macx-g++ | |
| parent | 722f4c34bdd4a2f2fa067b7c4c84b2dbe2f2033c (diff) | |
| download | Qt-3d1b93ce6a48ee4c305c052e165e7b16f6326bd1.zip Qt-3d1b93ce6a48ee4c305c052e165e7b16f6326bd1.tar.gz Qt-3d1b93ce6a48ee4c305c052e165e7b16f6326bd1.tar.bz2 | |
mkspecs: Move QMAKE_CC and QMAKE_CXX from gcc-base.conf to g++-base.conf
Since gcc-base is used for Clang and LLVM as well, we should not define
QMAKE_CC and QMAKE_CXX there. Moving it to g++-base.conf reduces the risk
of parsing errors in configure such as the one in dacda67ee449b6291.
Reviewed-by: ossi
Diffstat (limited to 'mkspecs/macx-g++')
| -rw-r--r-- | mkspecs/macx-g++/qmake.conf | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/mkspecs/macx-g++/qmake.conf b/mkspecs/macx-g++/qmake.conf index 0fd2c74..e402e54 100644 --- a/mkspecs/macx-g++/qmake.conf +++ b/mkspecs/macx-g++/qmake.conf @@ -13,9 +13,6 @@ CONFIG += qt warn_on release app_bundle incremental global_init_link_order lib QT += core gui QMAKE_INCREMENTAL_STYLE = sublib -QMAKE_CC = gcc -QMAKE_CXX = g++ - include(../common/mac.conf) include(../common/gcc-base-macx.conf) include(../common/g++-macx.conf) |