Merge remote-tracking branch 'origin/api_changes' into containters

Conflicts:
	src/corelib/kernel/qmetaobject.cpp
	src/corelib/kernel/qvariant.cpp
	src/tools/moc/moc.h

Change-Id: I2cd3d95b41d2636738c6b98064864941e3b0b4e6

1 files changed, 11 insertions, 11 deletions

diff --git a/src/widgets/graphicsview/qgraphicslayout.cpp b/src/widgets/graphicsview/qgraphicslayout.cpp
index 63f04f67bc..6f93dd511d 100644
--- a/src/widgets/graphicsview/qgraphicslayout.cpp
+++ b/src/widgets/graphicsview/qgraphicslayout.cpp
@@ -77,19 +77,19 @@ QT_BEGIN_NAMESPACE
     minimum:
 
     \table
-    \header \o Function                     \o Description
-    \row     \o QGraphicsLayoutItem::setGeometry()
-               \o Notifies you when the geometry of the layout is set. You can
+    \header \li Function                     \li Description
+    \row     \li QGraphicsLayoutItem::setGeometry()
+               \li Notifies you when the geometry of the layout is set. You can
                    store the geometry in your own layout class in a reimplementation
                    of this function.
-    \row    \o QGraphicsLayoutItem::sizeHint()
-               \o Returns the layout's size hints.
-    \row    \o QGraphicsLayout::count()
-              \o Returns the number of items in your layout.
-    \row    \o QGraphicsLayout::itemAt()
-              \o Returns a pointer to an item in your layout.
-    \row    \o QGraphicsLayout::removeAt()
-              \o Removes an item from your layout without destroying it.
+    \row    \li QGraphicsLayoutItem::sizeHint()
+               \li Returns the layout's size hints.
+    \row    \li QGraphicsLayout::count()
+              \li Returns the number of items in your layout.
+    \row    \li QGraphicsLayout::itemAt()
+              \li Returns a pointer to an item in your layout.
+    \row    \li QGraphicsLayout::removeAt()
+              \li Removes an item from your layout without destroying it.
     \endtable
 
     For more details on how to implement each function, refer to the individual