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

diff --git a/src/network/bearer/qnetworkconfiguration.cpp b/src/network/bearer/qnetworkconfiguration.cpp
index 037a7fdbf3..0aa843f393 100644
--- a/src/network/bearer/qnetworkconfiguration.cpp
+++ b/src/network/bearer/qnetworkconfiguration.cpp
@@ -424,37 +424,37 @@ QNetworkConfiguration::BearerType QNetworkConfiguration::bearerType() const
 
     \table
         \header
-            \o BearerType
-            \o Value
+            \li BearerType
+            \li Value
         \row
-            \o BearerUnknown
-            \o
-            \o The session is based on an unknown or unspecified bearer type. The value of the
+            \li BearerUnknown
+            \li
+            \li The session is based on an unknown or unspecified bearer type. The value of the
                string returned describes the bearer type.
         \row
-            \o BearerEthernet
-            \o Ethernet
+            \li BearerEthernet
+            \li Ethernet
         \row
-            \o BearerWLAN
-            \o WLAN
+            \li BearerWLAN
+            \li WLAN
         \row
-            \o Bearer2G
-            \o 2G
+            \li Bearer2G
+            \li 2G
         \row
-            \o BearerCDMA2000
-            \o CDMA2000
+            \li BearerCDMA2000
+            \li CDMA2000
         \row
-            \o BearerWCDMA
-            \o WCDMA
+            \li BearerWCDMA
+            \li WCDMA
         \row
-            \o BearerHSPA
-            \o HSPA
+            \li BearerHSPA
+            \li HSPA
         \row
-            \o BearerBluetooth
-            \o Bluetooth
+            \li BearerBluetooth
+            \li Bluetooth
         \row
-            \o BearerWiMAX
-            \o WiMAX
+            \li BearerWiMAX
+            \li WiMAX
     \endtable
 
     This function returns an empty string if this is an invalid configuration, a network