diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@nokia.com> | 2010-10-27 11:44:11 (GMT) |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@nokia.com> | 2010-10-27 13:11:08 (GMT) |
| commit | 48d19919cc82f637ee96873f81c957cdf9b84127 (patch) | |
| tree | 7002cbcba4efe80acf9b4f0b6bb5cffa8f8f97e9 /mkspecs/macx-g++40/qmake.conf | |
| parent | 2925995de32f76a72fcdd7d577e609a68a517fa1 (diff) | |
| download | Qt-48d19919cc82f637ee96873f81c957cdf9b84127.zip Qt-48d19919cc82f637ee96873f81c957cdf9b84127.tar.gz Qt-48d19919cc82f637ee96873f81c957cdf9b84127.tar.bz2 | |
mkspecs: Emit warning when including g++.conf directly
86636e0c4ab91bfb6 refactored the mkspecs, but didn't account for people
with their own mkspec who would still include g++.conf directly. We now
print a warning if this situation is detected, and explain to the user
how they can fix their mkspec.
For convenience we redirect g++.conf to g++-unix.conf so that people's
mkspecs will still work.
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Diffstat (limited to 'mkspecs/macx-g++40/qmake.conf')
| -rw-r--r-- | mkspecs/macx-g++40/qmake.conf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/macx-g++40/qmake.conf b/mkspecs/macx-g++40/qmake.conf index cfdd724..aa10fa2 100644 --- a/mkspecs/macx-g++40/qmake.conf +++ b/mkspecs/macx-g++40/qmake.conf @@ -17,7 +17,7 @@ QMAKE_CC = gcc-4.0 QMAKE_CXX = g++-4.0 include(../common/mac.conf) -include(../common/gcc-base-mac.conf) -include(../common/g++-mac.conf) +include(../common/gcc-base-macx.conf) +include(../common/g++-macx.conf) load(qt_config) |