diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-05-12 10:38:22 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-05-12 10:38:22 (GMT) |
| commit | cc957f4cb1a8dce2fb1eb406f54ccecb4092d238 (patch) | |
| tree | 5463704092728f10a58931fba7a2a74fa71f73d0 /mkspecs/macx-g++ | |
| parent | f14620878beed97c85c4b6a03a38f485800328d1 (diff) | |
| parent | 8c0cdfdd4772e81164d838b9549e8c554ecf5966 (diff) | |
| download | Qt-cc957f4cb1a8dce2fb1eb406f54ccecb4092d238.zip Qt-cc957f4cb1a8dce2fb1eb406f54ccecb4092d238.tar.gz Qt-cc957f4cb1a8dce2fb1eb406f54ccecb4092d238.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'mkspecs/macx-g++')
| -rw-r--r-- | mkspecs/macx-g++/qmake.conf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/macx-g++/qmake.conf b/mkspecs/macx-g++/qmake.conf index 64ef801..4355073 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) |