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, 6 insertions, 6 deletions

diff --git a/doc/src/examples/screenshot.qdoc b/doc/src/examples/screenshot.qdoc
index e99fe6cc19..7ee7ddb9c7 100644
--- a/doc/src/examples/screenshot.qdoc
+++ b/doc/src/examples/screenshot.qdoc
@@ -41,9 +41,9 @@
     desktop. They are provided with a couple of options:
 
     \list
-    \o Delaying the screenshot, giving them time to rearrange
+    \li Delaying the screenshot, giving them time to rearrange
        their desktop.
-    \o Hiding the application's window while the screenshot is taken.
+    \li Hiding the application's window while the screenshot is taken.
     \endlist
 
     In addition the application allows the users to save their
@@ -63,10 +63,10 @@
     to facilitate the options:
 
     \list
-    \o The \c newScreenshot() slot prepares a new screenshot.
-    \o The \c saveScreenshot() slot saves the last screenshot.
-    \o The \c shootScreen() slot takes the screenshot.
-    \o The \c updateCheckBox() slot enables or disables the
+    \li The \c newScreenshot() slot prepares a new screenshot.
+    \li The \c saveScreenshot() slot saves the last screenshot.
+    \li The \c shootScreen() slot takes the screenshot.
+    \li The \c updateCheckBox() slot enables or disables the
        \gui {Hide This Window} option.
     \endlist