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

 Conflicts:
	src/widgets/widgets/qabstractbutton.cpp
	src/widgets/widgets/qbuttongroup.cpp
	src/widgets/widgets/qbuttongroup.h
	src/widgets/widgets/qsplashscreen.cpp
	tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp
        tests/benchmarks/opengl/main.cpp

  Needed update:
	src/plugins/platforms/cocoa/CMakeLists.txt

Change-Id: I7be4baebb63844ec2b3e0de859ca9de1bc730bb5

1 files changed, 4 insertions, 5 deletions

diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 4cb0133e2f..efa71470d4 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -4376,16 +4376,15 @@ QDebug operator<<(QDebug dbg, const QObject *o)
     that values of a given enum can be used as flags and combined using the
     bitwise OR operator. For namespaces use \l Q_FLAG_NS() instead.
 
-    The macro must be placed after the enum declaration.
+    The macro must be placed after the enum declaration. The declaration of
+    the flags type is done using the \l Q_DECLARE_FLAGS() macro.
 
-    For example, in QLibrary, the \l{QLibrary::LoadHints}{LoadHints} flag is
+    For example, in QItemSelectionModel, the
+    \l{QItemSelectionModel::SelectionFlags}{SelectionFlags} flag is
     declared in the following way:
 
     \snippet code/src_corelib_kernel_qobject.cpp 39
 
-    The declaration of the flags themselves is performed in the public section
-    of the QLibrary class itself, using the \l Q_DECLARE_FLAGS() macro.
-
     \note The Q_FLAG macro takes care of registering individual flag values
     with the meta-object system, so it is unnecessary to use Q_ENUM()
     in addition to this macro.