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

diff --git a/doc/src/examples/arrowpad.qdoc b/doc/src/examples/arrowpad.qdoc
index ee35aa59ae..79bf94c510 100644
--- a/doc/src/examples/arrowpad.qdoc
+++ b/doc/src/examples/arrowpad.qdoc
@@ -142,18 +142,18 @@
     Now, enter the following translations:
 
     \list
-    \o \c ArrowPad
+    \li \c ArrowPad
          \list
-         \o \&Up - \&Haut
-         \o \&Left - \&Gauche
-         \o \&Right - \&Droite
-         \o \&Down - \&Bas
+         \li \&Up - \&Haut
+         \li \&Left - \&Gauche
+         \li \&Right - \&Droite
+         \li \&Down - \&Bas
          \endlist
-    \o \c MainWindow
+    \li \c MainWindow
          \list
-         \o E\&xit - \&Quitter
-         \o Ctrl+Q - Ctrl+Q
-         \o \&File - \&Fichier
+         \li E\&xit - \&Quitter
+         \li Ctrl+Q - Ctrl+Q
+         \li \&File - \&Fichier
          \endlist
     \endlist
 
@@ -164,18 +164,18 @@
     Save the file and do the same for Dutch working with \c arrowpad_nl.ts:
 
     \list
-    \o \c ArrowPad
+    \li \c ArrowPad
          \list
-         \o \&Up - \&Omhoog
-         \o \&Left - \&Links
-         \o \&Right - \&Rechts
-         \o \&Down - Omlaa\&g
+         \li \&Up - \&Omhoog
+         \li \&Left - \&Links
+         \li \&Right - \&Rechts
+         \li \&Down - Omlaa\&g
          \endlist
-    \o \c MainWindow
+    \li \c MainWindow
          \list
-         \o E\&xit - \&Afsluiten
-         \o Ctrl+Q - Ctrl+A
-         \o File - \&Bestand
+         \li E\&xit - \&Afsluiten
+         \li Ctrl+Q - Ctrl+A
+         \li File - \&Bestand
          \endlist
     \endlist