Merge remote-tracking branch 'origin/5.13' into dev

Change-Id: I4b56ce8c76729d9fc60995564299f8f27336fcde

10 files changed, 21 insertions, 17 deletions

diff --git a/src/gui/kernel/qclipboard.cpp b/src/gui/kernel/qclipboard.cpp
index a76150d91d..267c079ad9 100644
--- a/src/gui/kernel/qclipboard.cpp
+++ b/src/gui/kernel/qclipboard.cpp
@@ -439,7 +439,7 @@ void QClipboard::setPixmap(const QPixmap &pixmap, Mode mode)
     \fn QMimeData *QClipboard::mimeData(Mode mode) const
 
     Returns a pointer to a QMimeData representation of the current
-    clipboard data (can be NULL if the given \a mode is not
+    clipboard data (can be \nullptr if the given \a mode is not
     supported by the platform).
 
     The \a mode argument is used to control which part of the system
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index 4f648e54e9..7218e55627 100644
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@@ -1023,7 +1023,7 @@ QList<QScreen *> QGuiApplication::screens()
 }
 
 /*!
-    Returns the screen at \a point, or \c nullptr if outside of any screen.
+    Returns the screen at \a point, or \nullptr if outside of any screen.
 
     The \a point is in relation to the virtualGeometry() of each set of virtual
     siblings. If the point maps to more than one set of virtual siblings the first
diff --git a/src/gui/kernel/qopenglcontext.cpp b/src/gui/kernel/qopenglcontext.cpp
index 4847a62b0f..acb6c3fe94 100644
--- a/src/gui/kernel/qopenglcontext.cpp
+++ b/src/gui/kernel/qopenglcontext.cpp
@@ -1235,7 +1235,8 @@ void QOpenGLContext::deleteQGLContext()
   Returns the platform-specific handle for the OpenGL implementation that
   is currently in use. (for example, a HMODULE on Windows)
 
-  On platforms that do not use dynamic GL switch the return value is null.
+  On platforms that do not use dynamic GL switching, the return value
+  is \nullptr.
 
   The library might be GL-only, meaning that windowing system interface
   functions (for example EGL) may live in another, separate library.
diff --git a/src/gui/kernel/qplatformintegration.cpp b/src/gui/kernel/qplatformintegration.cpp
index bb20a160db..199ef0de07 100644
--- a/src/gui/kernel/qplatformintegration.cpp
+++ b/src/gui/kernel/qplatformintegration.cpp
@@ -291,7 +291,7 @@ QPlatformPixmap *QPlatformIntegration::createPlatformPixmap(QPlatformPixmap::Pix
     platform implementation is responsible for querying the configuriation from the provided
     native context.
 
-    Returns a pointer to a QPlatformOpenGLContext instance or \c NULL if the context could
+    Returns a pointer to a QPlatformOpenGLContext instance or \nullptr if the context could
     not be created.
 
     \sa QOpenGLContext
@@ -647,7 +647,7 @@ void QPlatformIntegration::setApplicationIcon(const QIcon &icon) const
     pointer to the instance for which a platform-specific backend needs to be
     created.
 
-    Returns a pointer to a QPlatformOpenGLContext instance or \c NULL if the context could
+    Returns a pointer to a QPlatformOpenGLContext instance or \nullptr if the context could
     not be created.
 
     \sa QVulkanInstance
diff --git a/src/gui/kernel/qshortcutmap.cpp b/src/gui/kernel/qshortcutmap.cpp
index 3bb42c1c0b..0395c1db38 100644
--- a/src/gui/kernel/qshortcutmap.cpp
+++ b/src/gui/kernel/qshortcutmap.cpp
@@ -175,7 +175,7 @@ int QShortcutMap::addShortcut(QObject *owner, const QKeySequence &key, Qt::Short
 
 /*! \internal
     Removes a shortcut from the global map.
-    If \a owner is 0, all entries in the map with the key sequence specified
+    If \a owner is \nullptr, all entries in the map with the key sequence specified
     is removed. If \a key is null, all sequences for \a owner is removed from
     the map. If \a id is 0, any identical \a key sequences owned by \a owner
     are removed.
@@ -222,7 +222,7 @@ int QShortcutMap::removeShortcut(int id, QObject *owner, const QKeySequence &key
 
 /*! \internal
     Changes the enable state of a shortcut to \a enable.
-    If \a owner is 0, all entries in the map with the key sequence specified
+    If \a owner is \nullptr, all entries in the map with the key sequence specified
     is removed. If \a key is null, all sequences for \a owner is removed from
     the map. If \a id is 0, any identical \a key sequences owned by \a owner
     are changed.
@@ -260,7 +260,7 @@ int QShortcutMap::setShortcutEnabled(bool enable, int id, QObject *owner, const
 
 /*! \internal
     Changes the auto repeat state of a shortcut to \a enable.
-    If \a owner is 0, all entries in the map with the key sequence specified
+    If \a owner is \nullptr, all entries in the map with the key sequence specified
     is removed. If \a key is null, all sequences for \a owner is removed from
     the map. If \a id is 0, any identical \a key sequences owned by \a owner
     are changed.
diff --git a/src/gui/opengl/qopenglfunctions.cpp b/src/gui/opengl/qopenglfunctions.cpp
index 92770cb55f..8ec814296a 100644
--- a/src/gui/opengl/qopenglfunctions.cpp
+++ b/src/gui/opengl/qopenglfunctions.cpp
@@ -206,7 +206,8 @@ QOpenGLFunctions::QOpenGLFunctions()
 
 /*!
     Constructs a function resolver for \a context.  If \a context
-    is null, then the resolver will be created for the current QOpenGLContext.
+    is \nullptr, then the resolver will be created for the current
+    QOpenGLContext.
 
     The context or another context in the group must be current.
 
@@ -5035,8 +5036,8 @@ QOpenGLExtraFunctions::QOpenGLExtraFunctions()
 }
 
 /*!
-    Constructs a function resolver for context. If \a context is null, then
-    the resolver will be created for the current QOpenGLContext.
+    Constructs a function resolver for context. If \a context is \nullptr,
+    then the resolver will be created for the current QOpenGLContext.
 
     The context or another context in the group must be current.
 
diff --git a/src/gui/opengl/qopenglshaderprogram.cpp b/src/gui/opengl/qopenglshaderprogram.cpp
index c39177080d..f225d5dc75 100644
--- a/src/gui/opengl/qopenglshaderprogram.cpp
+++ b/src/gui/opengl/qopenglshaderprogram.cpp
@@ -3667,7 +3667,8 @@ QVector<float> QOpenGLShaderProgram::defaultInnerTessellationLevels() const
     Language (GLSL) are supported on this system; false otherwise.
 
     The \a context is used to resolve the GLSL extensions.
-    If \a context is null, then QOpenGLContext::currentContext() is used.
+    If \a context is \nullptr, then QOpenGLContext::currentContext()
+    is used.
 */
 bool QOpenGLShaderProgram::hasOpenGLShaderPrograms(QOpenGLContext *context)
 {
@@ -3694,7 +3695,8 @@ void QOpenGLShaderProgram::shaderDestroyed()
     this system; false otherwise.
 
     The \a context is used to resolve the GLSL extensions.
-    If \a context is null, then QOpenGLContext::currentContext() is used.
+    If \a context is \nullptr, then QOpenGLContext::currentContext()
+    is used.
 */
 bool QOpenGLShader::hasOpenGLShaders(ShaderType type, QOpenGLContext *context)
 {
diff --git a/src/gui/painting/qbackingstore.cpp b/src/gui/painting/qbackingstore.cpp
index d935deb4d6..3fab903c4d 100644
--- a/src/gui/painting/qbackingstore.cpp
+++ b/src/gui/painting/qbackingstore.cpp
@@ -208,7 +208,7 @@ static bool isRasterSurface(QWindow *window)
 
     The \a window must either be the top level window represented by
     this backingstore, or a non-transient child of that window. Passing
-    \c nullptr falls back to using the backingstore's top level window.
+    \nullptr falls back to using the backingstore's top level window.
 
     If the \a window is a child window, the \a region should be in child window
     coordinates, and the \a offset should be the child window's offset in relation
diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp
index c363807e5e..1719855e68 100644
--- a/src/gui/text/qfontengine.cpp
+++ b/src/gui/text/qfontengine.cpp
@@ -1022,8 +1022,8 @@ void QFontEngine::getUnscaledGlyph(glyph_t glyph, QPainterPath *path, glyph_metr
     Returns \c true if the font table idetified by \a tag exists in the font;
     returns \c false otherwise.
 
-    If \a buffer is NULL, stores the size of the buffer required for the font table data,
-    in bytes, in \a length. If \a buffer is not NULL and the capacity
+    If \a buffer is \nullptr, stores the size of the buffer required for the font table data,
+    in bytes, in \a length. If \a buffer is not \nullptr and the capacity
     of the buffer, passed in \a length, is sufficient to store the font table data,
     also copies the font table data to \a buffer.
 
diff --git a/src/gui/vulkan/qvulkaninstance.cpp b/src/gui/vulkan/qvulkaninstance.cpp
index 000c2b8caa..9895fec2ca 100644
--- a/src/gui/vulkan/qvulkaninstance.cpp
+++ b/src/gui/vulkan/qvulkaninstance.cpp
@@ -306,7 +306,7 @@ QVulkanInstance::QVulkanInstance()
 /*!
     Destructor.
 
-    \note current() will return \c nullptr once the instance is destroyed.
+    \note current() will return \nullptr once the instance is destroyed.
  */
 QVulkanInstance::~QVulkanInstance()
 {