diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-26 05:09:59 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-26 05:09:59 (GMT) |
| commit | a4515ec14fdc772eb6b5c4801cddaddc26b94d84 (patch) | |
| tree | ddeb30f0825d2dc6badd49bd680d8ccb03793097 /qmake | |
| parent | cde378d2fd716b1853e780fb9db30b38dad4a854 (diff) | |
| parent | 2d0d09b19deb96c5c0761b33fe9114cdf0c4084d (diff) | |
| download | Qt-a4515ec14fdc772eb6b5c4801cddaddc26b94d84.zip Qt-a4515ec14fdc772eb6b5c4801cddaddc26b94d84.tar.gz Qt-a4515ec14fdc772eb6b5c4801cddaddc26b94d84.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Compile bootstrapped tools with QT_NO_DEPRECATED
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/Makefile.unix | 2 |
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) |