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

Change-Id: If950406391f79d99f0101f0b6755395accb26f34

2 files changed, 8 insertions, 7 deletions

diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index b75b218201..30c80b8b6f 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -3268,14 +3268,15 @@ QByteArray qgetenv(const char *varName)
 
 
 /*!
-    QString qEnvironmentVariable(const char *varName, const QString &defaultValue);
+    \fn QString qEnvironmentVariable(const char *varName, const QString &defaultValue)
+    \fn QString qEnvironmentVariable(const char *varName)
 
     \relates <QtGlobal>
     \since 5.10
 
-    Returns the value of the environment variable with name \a varName as a
-    QString. If no variable by that name is found in the environment, this
-    function returns \a defaultValue.
+    These functions return the value of the environment variable, \a varName, as a
+    QString. If no variable \a varName is found in the environment and \a defaultValue
+    is provided, \a defaultValue is returned. Otherwise QString() is returned.
 
     The Qt environment manipulation functions are thread-safe, but this
     requires that the C library equivalent functions like getenv and putenv are
@@ -3344,9 +3345,6 @@ QString qEnvironmentVariable(const char *varName, const QString &defaultValue)
 #endif
 }
 
-/*!
-  \internal
-*/
 QString qEnvironmentVariable(const char *varName)
 {
     return qEnvironmentVariable(varName, QString());
diff --git a/src/corelib/global/qlogging.cpp b/src/corelib/global/qlogging.cpp
index 17002c4231..7444145e82 100644
--- a/src/corelib/global/qlogging.cpp
+++ b/src/corelib/global/qlogging.cpp
@@ -208,6 +208,7 @@ static bool isDefaultCategory(const char *category)
 /*!
     Returns true if writing to \c stderr is supported.
 
+    \internal
     \sa stderrHasConsoleAttached()
 */
 static bool systemHasStderr()
@@ -236,6 +237,7 @@ static bool systemHasStderr()
     the output might still end up visible to the user. For this reason, we don't guard
     the stderr output in the default message handler with stderrHasConsoleAttached().
 
+    \internal
     \sa systemHasStderr()
 */
 bool stderrHasConsoleAttached()
@@ -288,6 +290,7 @@ namespace QtPrivate {
     This is normally the case if \c stderr has a console attached, but may be overridden
     by the user by setting the QT_FORCE_STDERR_LOGGING environment variable to \c 1.
 
+    \internal
     \sa stderrHasConsoleAttached()
 */
 bool shouldLogToStderr()