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 /src/corelib/io | |
| 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 'src/corelib/io')
| -rw-r--r-- | src/corelib/io/qdir.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
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 |