diff options
author | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2019-01-20 21:25:20 +0100 |
---|---|---|
committer | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2019-01-23 18:48:56 +0000 |
commit | 770b4afeed37ddf036dcbc287b68f9f7b151af27 (patch) | |
tree | 618b9a88d8813464ac184e8d28b0fc21a6bacc7b /src/corelib/io/qdir.h | |
parent | 612e4c5233c489603165f046d2d76935153b4169 (diff) |
QtCore: mark obsolete functions as deprecated
Mark the following obsolete functions as deprecated so they can be
removed with Qt6:
- QDataStream::unsetDevice()
- QDir &QDir::operator=(const QString &path)
- QDir::addResourceSearchPath()
- QResource::addSearchPath()
- QResource::searchPaths()
- QSettings::setSystemIniPath()
- QSettings::setUserIniPath()
Change-Id: I5edfb2b4ce1ad843fa5fcd5b4c475ab9352b05f7
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/io/qdir.h')
-rw-r--r-- | src/corelib/io/qdir.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/corelib/io/qdir.h b/src/corelib/io/qdir.h index 45c59d9e1d..9abb833ab1 100644 --- a/src/corelib/io/qdir.h +++ b/src/corelib/io/qdir.h @@ -105,7 +105,10 @@ 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 #ifdef Q_COMPILER_RVALUE_REFS QDir &operator=(QDir &&other) Q_DECL_NOTHROW { swap(other); return *this; } #endif @@ -118,7 +121,10 @@ public: QString absolutePath() const; QString canonicalPath() const; +#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); |