diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2020-07-16 14:09:37 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-08-07 17:44:26 +0200 |
| commit | f369be93a17d1b44cd76161bf9b88a167b0ab935 (patch) | |
| tree | a5e73680ade5f0f5388f2cea4067430cf3c6aff6 /src/corelib/io/qdir.cpp | |
| parent | 5a682b04ce29c6b51336456e0a3a4a4ed0e2dcb1 (diff) | |
Purge deprecated API from QDir
Assignment from QString and addResourceSearchPath(), both deprecated
since 5.13.
Change-Id: I25f08ffadc7b9dfd7895a9199255ca5f1948bd47
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/corelib/io/qdir.cpp')
| -rw-r--r-- | src/corelib/io/qdir.cpp | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp index 3e0174e383..d70ab3c7fe 100644 --- a/src/corelib/io/qdir.cpp +++ b/src/corelib/io/qdir.cpp @@ -1080,31 +1080,6 @@ void QDir::setNameFilters(const QStringList &nameFilters) d->nameFilters = nameFilters; } -#if QT_DEPRECATED_SINCE(5, 13) -/*! - \obsolete - - Use QDir::addSearchPath() with a prefix instead. - - Adds \a path to the search paths searched in to find resources - that are not specified with an absolute path. The default search - path is to search only in the root (\c{:/}). - - \sa {The Qt Resource System} -*/ -void QDir::addResourceSearchPath(const QString &path) -{ -#ifdef QT_BUILD_CORE_LIB -QT_WARNING_PUSH -QT_WARNING_DISABLE_DEPRECATED - QResource::addSearchPath(path); -QT_WARNING_POP -#else - Q_UNUSED(path); -#endif -} -#endif - #ifdef QT_BUILD_CORE_LIB /*! \since 4.3 @@ -1831,22 +1806,6 @@ QDir &QDir::operator=(const QDir &dir) return *this; } -#if QT_DEPRECATED_SINCE(5, 13) -/*! - \overload - \obsolete - - Sets the directory path to the given \a path. - - Use setPath() instead. -*/ -QDir &QDir::operator=(const QString &path) -{ - d_ptr->setPath(path); - return *this; -} -#endif - /*! \fn void QDir::swap(QDir &other) \since 5.0 |