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 | |
| 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
| -rw-r--r-- | qmake/Makefile.unix | 2 | ||||
| -rw-r--r-- | src/corelib/io/qdir.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/tools/qregexp.cpp | 3 | ||||
| -rw-r--r-- | src/tools/bootstrap/bootstrap.pri | 4 | ||||
| -rw-r--r-- | src/tools/bootstrap/bootstrap.pro | 4 |
5 files changed, 12 insertions, 3 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) diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp index ed51c5d..0eb8965 100644 --- a/src/corelib/io/qdir.cpp +++ b/src/corelib/io/qdir.cpp @@ -793,6 +793,7 @@ QString QDir::relativeFilePath(const QString &fileName) const return result; } +#ifndef QT_NO_DEPRECATED /*! \obsolete @@ -802,6 +803,7 @@ QString QDir::convertSeparators(const QString &pathName) { return toNativeSeparators(pathName); } +#endif /*! \since 4.2 diff --git a/src/corelib/tools/qregexp.cpp b/src/corelib/tools/qregexp.cpp index 36827d0..a0df065 100644 --- a/src/corelib/tools/qregexp.cpp +++ b/src/corelib/tools/qregexp.cpp @@ -4172,6 +4172,8 @@ int QRegExp::matchedLength() const } #ifndef QT_NO_REGEXP_CAPTURE + +#ifndef QT_NO_DEPRECATED /*! \obsolete Returns the number of captures contained in the regular expression. @@ -4182,6 +4184,7 @@ int QRegExp::numCaptures() const { return captureCount(); } +#endif /*! \since 4.6 diff --git a/src/tools/bootstrap/bootstrap.pri b/src/tools/bootstrap/bootstrap.pri index 1aa8121..f48c8c1 100644 --- a/src/tools/bootstrap/bootstrap.pri +++ b/src/tools/bootstrap/bootstrap.pri @@ -22,7 +22,9 @@ DEFINES += \ QT_NO_TEXTSTREAM \ QT_NO_THREAD \ QT_NO_UNICODETABLES \ - QT_NO_USING_NAMESPACE + QT_NO_USING_NAMESPACE \ + QT_NO_DEPRECATED + win32:DEFINES += QT_NODLL INCLUDEPATH += $$QT_BUILD_TREE/include \ diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro index a74c9c1..ce22a66 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -25,7 +25,9 @@ DEFINES += \ QT_NO_TEXTSTREAM \ QT_NO_THREAD \ QT_NO_UNICODETABLES \ - QT_NO_USING_NAMESPACE + QT_NO_USING_NAMESPACE \ + QT_NO_DEPRECATED + win32:DEFINES += QT_NODLL INCLUDEPATH += $$QT_BUILD_TREE/include \ |