summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorHarald Fernengel <harald.fernengel@nokia.com>2010-08-25 14:32:37 (GMT)
committerHarald Fernengel <harald.fernengel@nokia.com>2010-08-25 14:32:37 (GMT)
commit2d0d09b19deb96c5c0761b33fe9114cdf0c4084d (patch)
treec6b11bcdd4656d6957d087cce7281742ed003348 /qmake
parent4284942fabd5ba8bb6299bff1f788ff566ff3fc2 (diff)
downloadQt-2d0d09b19deb96c5c0761b33fe9114cdf0c4084d.zip
Qt-2d0d09b19deb96c5c0761b33fe9114cdf0c4084d.tar.gz
Qt-2d0d09b19deb96c5c0761b33fe9114cdf0c4084d.tar.bz2
Compile bootstrapped tools with QT_NO_DEPRECATED
This removes extra baggage from our bootstapped tools, and also ensures that we can compile it with host-g++ on Maemo which has a problem parsing our deprecated macros inside templates. Reviewed-by: Robert Griebl
Diffstat (limited to 'qmake')
-rw-r--r--qmake/Makefile.unix2
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix
index 8d56fc8..561cd0a 100644
--- a/qmake/Makefile.unix
+++ b/qmake/Makefile.unix
@@ -71,7 +71,7 @@ CPPFLAGS = -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/ma
-DQT_BUILD_QMAKE -DQT_BOOTSTRAPPED \
-DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT -DQT_NO_STL \
-DQT_NO_COMPRESS -I$(QMAKESPEC) -DHAVE_QCONFIG_CPP -DQT_NO_THREAD -DQT_NO_QOBJECT \
- -DQT_NO_GEOM_VARIANT $(OPENSOURCE_CXXFLAGS)
+ -DQT_NO_GEOM_VARIANT -DQT_NO_DEPRECATED $(OPENSOURCE_CXXFLAGS)
CXXFLAGS = @QMAKE_CXXFLAGS@ $(CPPFLAGS)