3 files changed, 17 insertions, 2 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index ea91dee471..c9e155555c 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -702,7 +702,7 @@ Q_STATIC_ASSERT((std::is_same<qsizetype, qptrdiff>::value));
     64-bit integer literals in a platform-independent way. The
     Q_CHECK_PTR() macro prints a warning containing the source code's
     file name and line number, saying that the program ran out of
-    memory, if the pointer is 0. The qPrintable() and qUtf8Printable()
+    memory, if the pointer is \nullptr. The qPrintable() and qUtf8Printable()
     macros represent an easy way of printing text.
 
     The QT_POINTER_SIZE macro expands to the size of a pointer in bytes.
@@ -3279,7 +3279,7 @@ QByteArray QSysInfo::bootUniqueId()
     \macro void Q_CHECK_PTR(void *pointer)
     \relates <QtGlobal>
 
-    If \a pointer is 0, prints a message containing the source
+    If \a pointer is \nullptr, prints a message containing the source
     code's file name and line number, saying that the program ran out
     of memory and aborts program execution. It throws \c std::bad_alloc instead
     if exceptions are enabled.
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
index b9e981b4a6..f278850ccf 100644
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@@ -1749,6 +1749,9 @@ namespace Qt {
         PassThrough
     };
 
+    // QTBUG-48701
+    enum ReturnByValue_t { ReturnByValue }; // ### Qt 7: Remove me
+
 #ifndef Q_QDOC
     // NOTE: Generally, do not add Q_ENUM_NS if a corresponding Q_FLAG_NS exists.
     Q_ENUM_NS(ScrollBarPolicy)
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc
index 6149281904..29b58783d5 100644
--- a/src/corelib/global/qnamespace.qdoc
+++ b/src/corelib/global/qnamespace.qdoc
@@ -3319,3 +3319,15 @@
   \value RoundPreferFloor Round up for .75 and above.
   \value PassThrough Don't round.
 */
+
+/*!
+  \enum Qt::ReturnByValue_t
+  \since 5.15
+
+  This is a dummy type, designed to help users transition from certain deprecated APIs to their replacement APIs.
+
+  \sa QCursor::bitmap()
+  \sa QCursor::mask()
+  \sa QLabel::picture()
+  \sa QLabel::pixmap()
+*/