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

diff --git a/doc/src/examples/maemovibration.qdoc b/doc/src/examples/maemovibration.qdoc
index 855793cf75..78bb7f5334 100644
--- a/doc/src/examples/maemovibration.qdoc
+++ b/doc/src/examples/maemovibration.qdoc
@@ -47,11 +47,11 @@
     The code makes use of two classes:
 
     \list
-    \o \c MceVibrator connects to the MCE service and can start a certain
+    \li \c MceVibrator connects to the MCE service and can start a certain
        vibrator pattern. It also is responsible to parse the configuration
        file.
 
-    \o \c ButtonWidget provides a button for each pattern. Pressing the button
+    \li \c ButtonWidget provides a button for each pattern. Pressing the button
        activates the pattern in question.
     \endlist
 
@@ -68,10 +68,10 @@
     are available to us.
 
     \list
-    \o \c mceInterface is our D-Bus handle to the MCE service. We use it to
+    \li \c mceInterface is our D-Bus handle to the MCE service. We use it to
        invoke methods on the MCE request object.
 
-    \o \c lastPatternName contains the pattern that was activated last time. We
+    \li \c lastPatternName contains the pattern that was activated last time. We
        have to keep track of this, because the last pattern has to be
        deactivated before activating a new pattern.
     \endlist