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

Conflicts:
	qmake/library/qmakeevaluator.cpp
	(cherry picked from commit 1af6dc2c8fb4d91400fddc5050166f972ae57c9a in qttools)
	src/corelib/kernel/qcore_mac_objc.mm
	src/gui/painting/qcolor.h
	src/plugins/platforms/cocoa/qcocoawindow.mm

Change-Id: I5b3ec468a5a9a73911b528d3d24ff8e19f339f31

1 files changed, 12 insertions, 2 deletions

diff --git a/src/widgets/kernel/qlayoutitem.cpp b/src/widgets/kernel/qlayoutitem.cpp
index 76568a2c33..ee0c28ec76 100644
--- a/src/widgets/kernel/qlayoutitem.cpp
+++ b/src/widgets/kernel/qlayoutitem.cpp
@@ -306,6 +306,8 @@ void QLayoutItem::invalidate()
 /*!
     If this item is a QLayout, it is returned as a QLayout; otherwise
     0 is returned. This function provides type-safe casting.
+
+    \sa spacerItem(), widget()
 */
 QLayout * QLayoutItem::layout()
 {
@@ -315,6 +317,8 @@ QLayout * QLayoutItem::layout()
 /*!
     If this item is a QSpacerItem, it is returned as a QSpacerItem;
     otherwise 0 is returned. This function provides type-safe casting.
+
+    \sa layout(), widget()
 */
 QSpacerItem * QLayoutItem::spacerItem()
 {
@@ -345,8 +349,14 @@ QSpacerItem * QSpacerItem::spacerItem()
 */
 
 /*!
-    If this item is a QWidget, it is returned as a QWidget; otherwise
-    0 is returned. This function provides type-safe casting.
+    If this item manages a QWidget, returns that widget. Otherwise,
+    \c nullptr is returned.
+
+    \note While the functions layout() and spacerItem() perform casts, this
+    function returns another object: QLayout and QSpacerItem inherit QLayoutItem,
+    while QWidget does not.
+
+    \sa layout(), spacerItem()
 */
 QWidget * QLayoutItem::widget()
 {