8 files changed, 31 insertions, 6 deletions
diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp
index 3007ffb958..c5a1dab50b 100644
--- a/src/corelib/io/qdir.cpp
+++ b/src/corelib/io/qdir.cpp
@@ -1060,6 +1060,7 @@ void QDir::setNameFilters(const QStringList &nameFilters)
     d->nameFilters = nameFilters;
 }
 
+#if QT_DEPRECATED_SINCE(5, 13)
 /*!
     \obsolete
 
@@ -1079,6 +1080,7 @@ void QDir::addResourceSearchPath(const QString &path)
     Q_UNUSED(path)
 #endif
 }
+#endif
 
 #ifdef QT_BUILD_CORE_LIB
 /*!
@@ -1806,6 +1808,7 @@ QDir &QDir::operator=(const QDir &dir)
     return *this;
 }
 
+#if QT_DEPRECATED_SINCE(5, 13)
 /*!
     \overload
     \obsolete
@@ -1819,6 +1822,7 @@ QDir &QDir::operator=(const QString &path)
     d_ptr->setPath(path);
     return *this;
 }
+#endif
 
 /*!
     \fn void QDir::swap(QDir &other)
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);
diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp
index 804029725a..e541b0ee20 100644
--- a/src/corelib/io/qresource.cpp
+++ b/src/corelib/io/qresource.cpp
@@ -659,6 +659,7 @@ QStringList QResource::children() const
     return d->children;
 }
 
+#if QT_DEPRECATED_SINCE(5, 13)
 /*!
   \obsolete
 
@@ -700,6 +701,7 @@ QResource::searchPaths()
     QMutexLocker lock(resourceMutex());
     return *resourceSearchPaths();
 }
+#endif
 
 inline uint QResourceRoot::hash(int node) const
 {
diff --git a/src/corelib/io/qresource.h b/src/corelib/io/qresource.h
index 9aa17608ce..5e798de436 100644
--- a/src/corelib/io/qresource.h
+++ b/src/corelib/io/qresource.h
@@ -78,8 +78,12 @@ public:
     const uchar *data() const;
     QDateTime lastModified() const;
 
+#if QT_DEPRECATED_SINCE(5, 13)
+    QT_DEPRECATED_X("Use QDir::addSearchPath() instead")
     static void addSearchPath(const QString &path);
+    QT_DEPRECATED_X("Use QDir::searchPaths() instead")
     static QStringList searchPaths();
+#endif
 
     static bool registerResource(const QString &rccFilename, const QString &resourceRoot=QString());
     static bool unregisterResource(const QString &rccFilename, const QString &resourceRoot=QString());
diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp
index d2887ee184..47b3548817 100644
--- a/src/corelib/io/qsettings.cpp
+++ b/src/corelib/io/qsettings.cpp
@@ -3444,6 +3444,7 @@ QSettings::Format QSettings::defaultFormat()
     return globalDefaultFormat;
 }
 
+#if QT_DEPRECATED_SINCE(5, 13)
 /*!
     \obsolete
 
@@ -3477,7 +3478,7 @@ void QSettings::setUserIniPath(const QString &dir)
     setPath(NativeFormat, UserScope, dir);
 #endif
 }
-
+#endif
 /*!
     \since 4.1
 
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;
diff --git a/src/corelib/serialization/qdatastream.cpp b/src/corelib/serialization/qdatastream.cpp
index 01808ebce6..cc4efc9be3 100644
--- a/src/corelib/serialization/qdatastream.cpp
+++ b/src/corelib/serialization/qdatastream.cpp
@@ -392,17 +392,18 @@ void QDataStream::setDevice(QIODevice *d)
     dev = d;
 }
 
+#if QT_DEPRECATED_SINCE(5, 13)
 /*!
     \obsolete
     Unsets the I/O device.
-    Use setDevice(0) instead.
+    Use setDevice(nullptr) instead.
 */
 
 void QDataStream::unsetDevice()
 {
-    setDevice(0);
+    setDevice(nullptr);
 }
-
+#endif
 
 /*!
     \fn bool QDataStream::atEnd() const
diff --git a/src/corelib/serialization/qdatastream.h b/src/corelib/serialization/qdatastream.h
index 2c874700e4..81134f74b0 100644
--- a/src/corelib/serialization/qdatastream.h
+++ b/src/corelib/serialization/qdatastream.h
@@ -131,7 +131,10 @@ public:
 
     QIODevice *device() const;
     void setDevice(QIODevice *);
+#if QT_DEPRECATED_SINCE(5, 13)
+    QT_DEPRECATED_X("Use QDataStream::setDevice(nullptr) instead")
     void unsetDevice();
+#endif
 
     bool atEnd() const;