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/qsettings.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/qsettings.h')
| -rw-r--r-- | src/corelib/io/qsettings.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/corelib/io/qsettings.h b/src/corelib/io/qsettings.h index 32290a3390..07c746d043 100644 --- a/src/corelib/io/qsettings.h +++ b/src/corelib/io/qsettings.h @@ -187,8 +187,12 @@ public: static void setDefaultFormat(Format format); static Format defaultFormat(); - static void setSystemIniPath(const QString &dir); // ### Qt 6: remove (use setPath() instead) - static void setUserIniPath(const QString &dir); // ### Qt 6: remove (use setPath() instead) +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X("Use QSettings::setPath() instead") + static void setSystemIniPath(const QString &dir); + QT_DEPRECATED_X("Use QSettings::setPath() instead") + static void setUserIniPath(const QString &dir); +#endif static void setPath(Format format, Scope scope, const QString &path); typedef QMap<QString, QVariant> SettingsMap; |