diff options
Diffstat (limited to 'src/corelib/io/qdir.h')
| -rw-r--r-- | src/corelib/io/qdir.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/corelib/io/qdir.h b/src/corelib/io/qdir.h index 05adb688f8..023d488545 100644 --- a/src/corelib/io/qdir.h +++ b/src/corelib/io/qdir.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -121,10 +121,6 @@ public: ~QDir(); QDir &operator=(const QDir &); -#if QT_DEPRECATED_SINCE(5, 13) - QT_DEPRECATED_X("Use QDir::setPath() instead") - QDir &operator=(const QString &path); -#endif QDir &operator=(QDir &&other) noexcept { swap(other); return *this; } void swap(QDir &other) noexcept @@ -152,11 +148,6 @@ public: { return QtPrivate::toFilesystemPath(canonicalPath()); } #endif // QT_CONFIG(cxx17_filesystem) -#if QT_DEPRECATED_SINCE(5, 13) - QT_DEPRECATED_X("Use QDir::addSearchPath() instead") - static void addResourceSearchPath(const QString &path); -#endif - static void setSearchPaths(const QString &prefix, const QStringList &searchPaths); static void addSearchPath(const QString &prefix, const QString &path); #ifdef Q_CLANG_QDOC |