summaryrefslogtreecommitdiffstats
path: root/mkspecs/symbian-gcce
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@nokia.com>2010-10-27 11:44:11 (GMT)
committerTor Arne Vestbø <tor.arne.vestbo@nokia.com>2010-10-27 13:11:08 (GMT)
commit48d19919cc82f637ee96873f81c957cdf9b84127 (patch)
tree7002cbcba4efe80acf9b4f0b6bb5cffa8f8f97e9 /mkspecs/symbian-gcce
parent2925995de32f76a72fcdd7d577e609a68a517fa1 (diff)
downloadQt-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/symbian-gcce')
-rw-r--r--mkspecs/symbian-gcce/qmake.conf3
1 files changed, 2 insertions, 1 deletions
diff --git a/mkspecs/symbian-gcce/qmake.conf b/mkspecs/symbian-gcce/qmake.conf
index f012217..7051a9c 100644
--- a/mkspecs/symbian-gcce/qmake.conf
+++ b/mkspecs/symbian-gcce/qmake.conf
@@ -4,7 +4,8 @@
include(../common/symbian/symbian-makefile.conf)
-include(../common/g++.conf)
+include(../common/g++-unix.conf)
+include(../common/gcc-base-unix.conf)
QMAKE_CC = arm-none-symbianelf-gcc
QMAKE_CXX = arm-none-symbianelf-g++