Remove the usage of deprecated qdoc macros.

QDoc now has support for Doxygen style commands for italics, bold
and list items. This change applies that change in QDoc to the
actual documentation.

Task-number: QTBUG-24578
Change-Id: I40e6d40c8ca9b5e7b98a16aab3fac57ec84be63d
Reviewed-by: Alex <alex.blasche@nokia.com>

22 files changed, 107 insertions, 107 deletions

diff --git a/doc/compat.qdocconf b/doc/compat.qdocconf
index 0b59629e..53a26136 100644
--- a/doc/compat.qdocconf
+++ b/doc/compat.qdocconf
@@ -5,24 +5,24 @@ macro.0                         = "\\\\0"
 macro.b                         = "\\\\b"
 macro.n                         = "\\\\n"
 macro.r                         = "\\\\r"
-macro.i                         = "\\o"
-macro.i11                       = "\\o{1,1}"
-macro.i12                       = "\\o{1,2}"
-macro.i13                       = "\\o{1,3}"
-macro.i14                       = "\\o{1,4}"
-macro.i15                       = "\\o{1,5}"
-macro.i16                       = "\\o{1,6}"
-macro.i17                       = "\\o{1,7}"
-macro.i18                       = "\\o{1,8}"
-macro.i19                       = "\\o{1,9}"
-macro.i21                       = "\\o{2,1}"
-macro.i31                       = "\\o{3,1}"
-macro.i41                       = "\\o{4,1}"
-macro.i51                       = "\\o{5,1}"
-macro.i61                       = "\\o{6,1}"
-macro.i71                       = "\\o{7,1}"
-macro.i81                       = "\\o{8,1}"
-macro.i91                       = "\\o{9,1}"
+macro.i                         = "\\li"
+macro.i11                       = "\\li{1,1}"
+macro.i12                       = "\\li{1,2}"
+macro.i13                       = "\\li{1,3}"
+macro.i14                       = "\\li{1,4}"
+macro.i15                       = "\\li{1,5}"
+macro.i16                       = "\\li{1,6}"
+macro.i17                       = "\\li{1,7}"
+macro.i18                       = "\\li{1,8}"
+macro.i19                       = "\\li{1,9}"
+macro.i21                       = "\\li{2,1}"
+macro.i31                       = "\\li{3,1}"
+macro.i41                       = "\\li{4,1}"
+macro.i51                       = "\\li{5,1}"
+macro.i61                       = "\\li{6,1}"
+macro.i71                       = "\\li{7,1}"
+macro.i81                       = "\\li{8,1}"
+macro.i91                       = "\\li{9,1}"
 macro.img                       = "\\image"
 macro.endquote                  = "\\endquotation"
 macro.relatesto                 = "\\relates"
diff --git a/doc/macros.qdocconf b/doc/macros.qdocconf
index ca458c15..dd468412 100644
--- a/doc/macros.qdocconf
+++ b/doc/macros.qdocconf
@@ -2,17 +2,17 @@ macro.aacute.HTML       = "á"
 macro.Aring.HTML        = "Å"
 macro.aring.HTML        = "å"
 macro.Auml.HTML         = "Ä"
-macro.author            = "\\bold{Author:}"
+macro.author            = "\\b{Author:}"
 macro.br.HTML           = "<br />"
 macro.BR.HTML           = "<br />"
 macro.copyright.HTML    = "&copy;"
 macro.eacute.HTML       = "&eacute;"
-macro.gui               = "\\bold"
+macro.gui               = "\\b"
 macro.hr.HTML           = "<hr />"
 macro.iacute.HTML       = "&iacute;"
-macro.key               = "\\bold"
-macro.menu              = "\\bold"
-macro.note              = "\\bold{Note:}"
+macro.key               = "\\b"
+macro.menu              = "\\b"
+macro.note              = "\\b{Note:}"
 macro.oslash.HTML       = "&oslash;"
 macro.ouml.HTML         = "&ouml;"
 macro.QA                = "Qt Assistant"
diff --git a/doc/src/bluetooth-cpp.qdoc b/doc/src/bluetooth-cpp.qdoc
index a92b068b..fff1734d 100644
--- a/doc/src/bluetooth-cpp.qdoc
+++ b/doc/src/bluetooth-cpp.qdoc
@@ -72,24 +72,24 @@ To link against the module, add this line to your \l qmake \c
 The following sample applications show examples of API usage:
     \table 80%
         \header
-            \o Example
-            \o Description
+            \li Example
+            \li Description
         \row
-            \o \l{btchat}{Bluetooth Chat}
-            \o A chat server and client using bluetooth.
+            \li \l{btchat}{Bluetooth Chat}
+            \li A chat server and client using bluetooth.
         \row
-            \o \l{bttennis}{Bluetooth Tennis}
-            \o The classic game of \l {http://en.wikipedia.org/wiki/Pong}{Pong}. Supports multiplayer
+            \li \l{bttennis}{Bluetooth Tennis}
+            \li The classic game of \l {http://en.wikipedia.org/wiki/Pong}{Pong}. Supports multiplayer
             over Bluetooth and touch-to-play functionality on devices that support NFC.
         \row
-            \o \l{btfiletransfer}{Bluetooth File Transfer}
-            \o Transfer files between Bluetooth devices.
+            \li \l{btfiletransfer}{Bluetooth File Transfer}
+            \li Transfer files between Bluetooth devices.
         \row
-            \o \l{btscanner}{Bluetooth Scanner}
-            \o Scan for Bluetooth devices.
+            \li \l{btscanner}{Bluetooth Scanner}
+            \li Scan for Bluetooth devices.
         \row
-            \o \l{bluetoothtransferplugin}{Bluetooth Transfer Plugin}
-            \o A Service Framework plugin that enables sending files over Bluetooth through the Service Framework
+            \li \l{bluetoothtransferplugin}{Bluetooth Transfer Plugin}
+            \li A Service Framework plugin that enables sending files over Bluetooth through the Service Framework
     \endtable
 
 
diff --git a/doc/src/bluetooth-overview.qdoc b/doc/src/bluetooth-overview.qdoc
index b353cd3c..d8963110 100644
--- a/doc/src/bluetooth-overview.qdoc
+++ b/doc/src/bluetooth-overview.qdoc
@@ -47,11 +47,11 @@ the Bluetooth connection.
     With the Qt Bluetooth API typical use cases are:
 
         \list
-        \o Retrieve information about the local Bluetooth device
-        \o Scan for other Bluetooth devices in range and retrieve information about them
-        \o Connect to remote devices through a RFCOMM channel using the serial port profile (SPP).
-        \o Create a RFCOMM server that allows incoming connections using SPP.
-        \o Push files to remote devices using the Obex Object Push Profile (OPP).
+        \li Retrieve information about the local Bluetooth device
+        \li Scan for other Bluetooth devices in range and retrieve information about them
+        \li Connect to remote devices through a RFCOMM channel using the serial port profile (SPP).
+        \li Create a RFCOMM server that allows incoming connections using SPP.
+        \li Push files to remote devices using the Obex Object Push Profile (OPP).
         \endlist
 
 
@@ -67,7 +67,7 @@ the Bluetooth connection.
     There are a number of QML Elements available in the Qt Bluetooth API.
 
     \list
-        \o \l {Bluetooth QML API}{Bluetooth QML API}
+        \li \l {Bluetooth QML API}{Bluetooth QML API}
     \endlist
 
     \section2 C++ Bluetooth API
@@ -76,7 +76,7 @@ the Bluetooth connection.
     to interact with remote devices.
 
     \list
-        \o \l {Bluetooth C++ API} {Bluetooth C++ API}.
+        \li \l {Bluetooth C++ API} {Bluetooth C++ API}.
     \endlist
 
 */
diff --git a/doc/src/bluetooth-qml.qdoc b/doc/src/bluetooth-qml.qdoc
index fb196fd2..6058230f 100644
--- a/doc/src/bluetooth-qml.qdoc
+++ b/doc/src/bluetooth-qml.qdoc
@@ -64,16 +64,16 @@ After importing the Bluetooth API you can use its elements. This example shows h
 
     \table 80%
         \header
-            \o Example
-            \o Description
+            \li Example
+            \li Description
 
         \row
-            \o \l{bttennis}{QML Bluetooth Tennis}
-            \o The tennis game using a QML interface to the Bluetooth API. It must connect to an
+            \li \l{bttennis}{QML Bluetooth Tennis}
+            \li The tennis game using a QML interface to the Bluetooth API. It must connect to an
             instance of the C++ \l{bttennis}{Bluetooth Tennis} game to play.
         \row
-            \o \l{btscanner}{QML Bluetooth Scanner}
-            \o A QML implementation of the Bluetooth device scanner.
+            \li \l{btscanner}{QML Bluetooth Scanner}
+            \li A QML implementation of the Bluetooth device scanner.
     \endtable
 
 */
diff --git a/doc/src/examples.qdoc b/doc/src/examples.qdoc
index 4b621122..72367a45 100644
--- a/doc/src/examples.qdoc
+++ b/doc/src/examples.qdoc
@@ -39,35 +39,35 @@
     \section2 C++ Examples
     \table 80%
         \header
-            \o Example
-            \o Description
+            \li Example
+            \li Description
         \row
-            \o \l{bttennis}{Bluetooth Tennis}
-            \o The classic game of \l {http://en.wikipedia.org/wiki/Pong}{Pong}. Supports multiplayer
+            \li \l{bttennis}{Bluetooth Tennis}
+            \li The classic game of \l {http://en.wikipedia.org/wiki/Pong}{Pong}. Supports multiplayer
             over Bluetooth and touch-to-play functionality on devices that support NFC.
         \row
-            \o \l{btfiletransfer}{Bluetooth File Transfer}
-            \o Transfer files between Bluetooth devices.
+            \li \l{btfiletransfer}{Bluetooth File Transfer}
+            \li Transfer files between Bluetooth devices.
         \row
-            \o \l{btscanner}{Bluetooth Scanner}
-            \o Scan for Bluetooth devices.
+            \li \l{btscanner}{Bluetooth Scanner}
+            \li Scan for Bluetooth devices.
         \row
-            \o \l{bluetoothtransferplugin}{Bluetooth Transfer Plugin}
-            \o A Service Framework plugin that enables sending files over Bluetooth through the Service Framework
+            \li \l{bluetoothtransferplugin}{Bluetooth Transfer Plugin}
+            \li A Service Framework plugin that enables sending files over Bluetooth through the Service Framework
     \endtable
 
     \section2 QML Examples
     \table 80%
         \header
-            \o Example
-            \o Description
+            \li Example
+            \li Description
         \row
-            \o \l{bttennis}{QML Bluetooth Tennis}
-            \o The tennis game using a QML interface to the Bluetooth API. It must connect to an
+            \li \l{bttennis}{QML Bluetooth Tennis}
+            \li The tennis game using a QML interface to the Bluetooth API. It must connect to an
             instance of the C++ \l{bttennis}{Bluetooth Tennis} game to play.
         \row
-            \o \l{btscanner}{QML Bluetooth Scanner}
-            \o A QML implementation of the Bluetooth device scanner.
+            \li \l{btscanner}{QML Bluetooth Scanner}
+            \li A QML implementation of the Bluetooth device scanner.
     \endtable
 
 */
diff --git a/doc/src/examples/bluetoothtransferplugin.qdoc b/doc/src/examples/bluetoothtransferplugin.qdoc
index fb055812..6025aa37 100644
--- a/doc/src/examples/bluetoothtransferplugin.qdoc
+++ b/doc/src/examples/bluetoothtransferplugin.qdoc
@@ -32,7 +32,7 @@
     This example shows how to write a service plugin for the \l{Qt Service Framework}{Service Framework}.
 
     \section1 Registering the Service
-    The service can be registered by using the function \l{QServiceManager::}{addService()}, this takes a path to the XML file that describes the service, \i{bluetoothtransferservice.xml}.
+    The service can be registered by using the function \l{QServiceManager::}{addService()}, this takes a path to the XML file that describes the service, \li{bluetoothtransferservice.xml}.
 
     \section1 Writing the Plugin
     To implement a plugin it is necessary to create a new plugin class derived from QObject and QServicePluginInterface. The function QServicePluginInterface::createInstance() is implemented to return the appropriate instantiated object based on the interface name passed into the function. Since there is only one interface name for this example there is no test involved, so we can simply create the object implementing the service and return its pointer.
diff --git a/doc/src/examples/btchat.qdoc b/doc/src/examples/btchat.qdoc
index ed318619..b40417ec 100644
--- a/doc/src/examples/btchat.qdoc
+++ b/doc/src/examples/btchat.qdoc
@@ -118,7 +118,7 @@
     \snippet ../examples/btchat/chatclient.h declaration
 
     The client creates a new QBluetoothSocket and connects to the remote service described by the
-    \i remoteService parameter.  Slots are connected to the sockets readyRead(), connected() and
+    \e remoteService parameter.  Slots are connected to the sockets readyRead(), connected() and
     disconnected() signals.
 
     \snippet ../examples/btchat/chatclient.cpp startClient
diff --git a/src/bluetooth/qbluetoothdeviceinfo.cpp b/src/bluetooth/qbluetoothdeviceinfo.cpp
index c2304748..c2b9a095 100644
--- a/src/bluetooth/qbluetoothdeviceinfo.cpp
+++ b/src/bluetooth/qbluetoothdeviceinfo.cpp
@@ -274,11 +274,11 @@ QBluetoothDeviceInfo::QBluetoothDeviceInfo()
     The \a classOfDevice parameter is encoded in the following format
 
     \table
-        \header \o Bits \o Size \o Description
-        \row \o 0 - 1 \o 2 \o Unused, set to 0.
-        \row \o 2 - 7 \o 6 \o Minor device class.
-        \row \o 8 - 12 \o 5 \o Major device class.
-        \row \o 13 - 23 \o 11 \o Service class.
+        \header \li Bits \li Size \li Description
+        \row \li 0 - 1 \li 2 \li Unused, set to 0.
+        \row \li 2 - 7 \li 6 \li Minor device class.
+        \row \li 8 - 12 \li 5 \li Major device class.
+        \row \li 13 - 23 \li 11 \li Service class.
     \endtable
 */
 QBluetoothDeviceInfo::QBluetoothDeviceInfo(const QBluetoothAddress &address, const QString &name, quint32 classOfDevice)
diff --git a/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp b/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp
index 6506b753..7f781f84 100644
--- a/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp
+++ b/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp
@@ -55,7 +55,7 @@
     \ingroup bluetooth-qml
     \inmodule QtBluetooth
 
-    The BluetoothDiscoveryModel element was introduced in \bold{QtBluetooth 5.0}.
+    The BluetoothDiscoveryModel element was introduced in \b{QtBluetooth 5.0}.
 
     BluetoothDiscoveryModel provides a model of connectable services. The
     contents of the model can be filtered by UUID allowing discovery to be
diff --git a/src/imports/bluetooth/qdeclarativebluetoothservice.cpp b/src/imports/bluetooth/qdeclarativebluetoothservice.cpp
index 3b409293..642f7b85 100644
--- a/src/imports/bluetooth/qdeclarativebluetoothservice.cpp
+++ b/src/imports/bluetooth/qdeclarativebluetoothservice.cpp
@@ -61,7 +61,7 @@
    \sa QBluetoothAddress
    \sa QBluetoothSocket
 
-    The BluetoothService element was introduced in \bold{QtBluetooth 5.0}.
+    The BluetoothService element was introduced in \b{QtBluetooth 5.0}.
 
     It allows a QML project to get information about a remote service, or describe a service
     for a BluetoothSocket to connect to.
diff --git a/src/imports/bluetooth/qdeclarativebluetoothsocket.cpp b/src/imports/bluetooth/qdeclarativebluetoothsocket.cpp
index 10315ebc..d903c700 100644
--- a/src/imports/bluetooth/qdeclarativebluetoothsocket.cpp
+++ b/src/imports/bluetooth/qdeclarativebluetoothsocket.cpp
@@ -65,7 +65,7 @@
    \sa QBluetoothSocket
    \sa QDataStream
 
-    The BluetoothSocket element was introduced in \bold{QtBluetooth 5.0}.
+    The BluetoothSocket element was introduced in \b{QtBluetooth 5.0}.
 
     It allows a QML class connect to another bluetooth device and send
     and receive QString from the device. Data is sent and received using a
diff --git a/src/imports/nfc/qdeclarativendeffilter.cpp b/src/imports/nfc/qdeclarativendeffilter.cpp
index e87b6763..cdc0081e 100644
--- a/src/imports/nfc/qdeclarativendeffilter.cpp
+++ b/src/imports/nfc/qdeclarativendeffilter.cpp
@@ -51,7 +51,7 @@
     \sa NearField
     \sa QNdefFilter
 
-    The NdefFilter element was introduced in \bold {QtNfc 5.0}.
+    The NdefFilter element was introduced in \b {QtNfc 5.0}.
 
     The NdefFilter element is used with the NearField element to read NDEF messages from NFC Forum
     tags that match a given structure.
@@ -74,7 +74,7 @@
 
     This property holds the NDEF record type that the filter matches.  This property must be set to
     the fully qualified record type, i.e. including the NIS and NSS prefixes.  For example set to
-    \i {urn:nfc:wkt:U} to match NFC RTD-URI records.
+    \li {urn:nfc:wkt:U} to match NFC RTD-URI records.
 */
 
 /*!
diff --git a/src/imports/nfc/qdeclarativendefmimerecord.cpp b/src/imports/nfc/qdeclarativendefmimerecord.cpp
index 6e17e787..1d5a3280 100644
--- a/src/imports/nfc/qdeclarativendefmimerecord.cpp
+++ b/src/imports/nfc/qdeclarativendefmimerecord.cpp
@@ -50,7 +50,7 @@
 
     \inherits NdefRecord
 
-    The NdefMimeRecord element was introduced in \bold {QtNfc 5.0}.
+    The NdefMimeRecord element was introduced in \b {QtNfc 5.0}.
 
     The NdefMimeRecord element can contain data with an associated MIME type.  The data is
     accessible from the uri in the \l {NdefMimeRecord::uri}{uri} property.
diff --git a/src/imports/nfc/qdeclarativendeftextrecord.cpp b/src/imports/nfc/qdeclarativendeftextrecord.cpp
index eeaba246..f55b1e62 100644
--- a/src/imports/nfc/qdeclarativendeftextrecord.cpp
+++ b/src/imports/nfc/qdeclarativendeftextrecord.cpp
@@ -54,7 +54,7 @@
 
     \sa QNdefNfcTextRecord
 
-    The NdefTextRecord element was introduced in \bold {QtNfc 5.0}.
+    The NdefTextRecord element was introduced in \b {QtNfc 5.0}.
 
     The NdefTextRecord element contains a localized piece of text that can be display to the user.
     An NDEF message may contain many text records for different locales, it is up to the
@@ -84,23 +84,23 @@
 
     \table
         \header
-            \o Value
-            \o Description
+            \li Value
+            \li Description
         \row
-            \o LocaleMatchedNone
-            \o The text record does not match at all.
+            \li LocaleMatchedNone
+            \li The text record does not match at all.
         \row
-            \o LocaleMatchedEnglish
-            \o The language of the text record is English and the language of application's current
-               locale is \bold {not} English.  The English language text should be displayed if
+            \li LocaleMatchedEnglish
+            \li The language of the text record is English and the language of application's current
+               locale is \b {not} English.  The English language text should be displayed if
                there is not a more appropriate match.
         \row
-            \o LocaleMatchedLanguage
-            \o The language of the text record and the language of the applications's current
+            \li LocaleMatchedLanguage
+            \li The language of the text record and the language of the applications's current
                locale are the same.
         \row
-            \o LocaleMatchedLanguageAndCountry
-            \o The language and country of the text record matches that of the applicatin's current
+            \li LocaleMatchedLanguageAndCountry
+            \li The language and country of the text record matches that of the applicatin's current
                locale.
     \endtable
 */
diff --git a/src/imports/nfc/qdeclarativendefurirecord.cpp b/src/imports/nfc/qdeclarativendefurirecord.cpp
index 897b98af..0eada170 100644
--- a/src/imports/nfc/qdeclarativendefurirecord.cpp
+++ b/src/imports/nfc/qdeclarativendefurirecord.cpp
@@ -54,7 +54,7 @@
 
     \sa QNdefNfcUriRecord
 
-    The NdefUriRecord element was introduced in \bold {QtNfc 5.0}.
+    The NdefUriRecord element was introduced in \b {QtNfc 5.0}.
 */
 
 /*!
diff --git a/src/imports/nfc/qdeclarativenearfield.cpp b/src/imports/nfc/qdeclarativenearfield.cpp
index 398afbf8..5f7bde4a 100644
--- a/src/imports/nfc/qdeclarativenearfield.cpp
+++ b/src/imports/nfc/qdeclarativenearfield.cpp
@@ -63,7 +63,7 @@
     \sa QNdefMessage
     \sa QNdefRecord
 
-    The NearField element was introduced in \bold {QtNfc 5.0}.
+    The NearField element was introduced in \b {QtNfc 5.0}.
 
     The NearField element can be used to read NDEF messages from NFC Forum tags.  Set the \l filter
     and \l orderMatch properties to match the required NDEF messages.  Once an NDEF message is
diff --git a/src/imports/nfc/qdeclarativenearfieldsocket.cpp b/src/imports/nfc/qdeclarativenearfieldsocket.cpp
index 9de4ff3f..205ef343 100644
--- a/src/imports/nfc/qdeclarativenearfieldsocket.cpp
+++ b/src/imports/nfc/qdeclarativenearfieldsocket.cpp
@@ -53,7 +53,7 @@
     \sa QLlcpSocket
     \sa QLlcpServer
 
-    The NearFieldSocket element was introduced in \bold {QtNfc 5.0}.
+    The NearFieldSocket element was introduced in \b {QtNfc 5.0}.
 
     The NearFieldSocket element can be used to create a peer-to-peer connection over NFC LLCP
     sockets.  NearfieldSocket can be used for both client and server side sockets.
diff --git a/src/nfc/qdeclarativendefrecord.cpp b/src/nfc/qdeclarativendefrecord.cpp
index 68fb7563..8c95ea50 100644
--- a/src/nfc/qdeclarativendefrecord.cpp
+++ b/src/nfc/qdeclarativendefrecord.cpp
@@ -61,12 +61,12 @@ QTNFC_BEGIN_NAMESPACE
     create a new NDEF record type in QML:
 
     \list
-        \o The subclass must have a Q_OBJECT macro in its declaration.
-        \o The subclass must have an \l {Q_INVOKABLE}{invokable} constructor that takes a
+        \li The subclass must have a Q_OBJECT macro in its declaration.
+        \li The subclass must have an \l {Q_INVOKABLE}{invokable} constructor that takes a
            QNdefRecord and a QObject pointer.
-        \o The subclass must be declared as an NDEF record by expanding the Q_DECLARE_NDEFRECORD()
+        \li The subclass must be declared as an NDEF record by expanding the Q_DECLARE_NDEFRECORD()
            macro in the implementation file of the subclass.
-        \o The subclass must be registered with QML.
+        \li The subclass must be registered with QML.
     \endlist
 
     For example the declaration of such a class may look like the following.
diff --git a/src/nfc/qndefrecord.cpp b/src/nfc/qndefrecord.cpp
index 573b7245..9dd2ff6e 100644
--- a/src/nfc/qndefrecord.cpp
+++ b/src/nfc/qndefrecord.cpp
@@ -78,7 +78,7 @@ QTNFC_BEGIN_NAMESPACE
 
     Specialized NDEF record classes can be easily created with the Q_DECLARE_NDEF_RECORD() and
     Q_DECLARE_ISRECORDTYPE_FOR_NDEF_RECORD() macros.  The following example shows the class
-    declaration of the hypothetical \i {example.com:f} record type that encapsulates a single int
+    declaration of the hypothetical \e {example.com:f} record type that encapsulates a single int
     property foo.
 
     \snippet ../doc/src/snippets/nfc.cpp Specialized class definition
@@ -122,7 +122,7 @@ QTNFC_BEGIN_NAMESPACE
 
     \a className is the name of the specialized class, \a typeNameFormat is the appropriate
     QNdefRecord::TypeNameFormat for the custom type and \a type is the type without the NID or NSS
-    prefixes. That is \i {example.com:f} not \i {urn:nfc:ext:example.com:f}.  \a initialPayload
+    prefixes. That is \e {example.com:f} not \e {urn:nfc:ext:example.com:f}.  \a initialPayload
     is the initial payload of an empty record, it must be a QByteArray or a type that can be
     implicitly converted into a QByteArray.
 
@@ -142,7 +142,7 @@ QTNFC_BEGIN_NAMESPACE
 
     \a className is the name of the specialized class, \a typeNameFormat is the appropriate
     QNdefRecord::TypeNameFormat for the custom type and \a type is the type without the NID or NSS
-    prefixes.  That is \i {example.com:f} not \i {urn:nfc:ext:example.com:f}.
+    prefixes.  That is \e {example.com:f} not \e {urn:nfc:ext:example.com:f}.
 
     See the secton on \l {Creating specialized NDEF record classes} for details.
 
diff --git a/src/nfc/qnearfieldmanager.cpp b/src/nfc/qnearfieldmanager.cpp
index e08d0ff4..830c4ca5 100644
--- a/src/nfc/qnearfieldmanager.cpp
+++ b/src/nfc/qnearfieldmanager.cpp
@@ -330,8 +330,8 @@ static QMetaMethod methodForSignature(QObject *object, const char *method)
     Returns an identifier, which can be used to unregister the handler, on success; otherwise
     returns -1.
 
-    \note The \i target parameter of \a method may not be available on all platforms, in which case
-    \i target will be 0.
+    \note The \e target parameter of \a method may not be available on all platforms, in which case
+    \e target will be 0.
 */
 
 int QNearFieldManager::registerNdefMessageHandler(QNdefRecord::TypeNameFormat typeNameFormat,
@@ -365,8 +365,8 @@ int QNearFieldManager::registerNdefMessageHandler(QNdefRecord::TypeNameFormat ty
     NDEF message matching a pre-registered message format is received. See the section on
     \l {Automatically launching NDEF message handlers}.
 
-    \note The \i target parameter of \a method may not be available on all platforms, in which case
-    \i target will be 0.
+    \note The \e target parameter of \a method may not be available on all platforms, in which case
+    \e target will be 0.
 */
 int QNearFieldManager::registerNdefMessageHandler(QObject *object, const char *method)
 {
@@ -387,8 +387,8 @@ int QNearFieldManager::registerNdefMessageHandler(QObject *object, const char *m
     Returns an identifier, which can be used to unregister the handler, on success; otherwise
     returns -1.
 
-    \note The \i target parameter of \a method may not be available on all platforms, in which case
-    \i target will be 0.
+    \note The \e target parameter of \a method may not be available on all platforms, in which case
+    \e target will be 0.
 */
 int QNearFieldManager::registerNdefMessageHandler(const QNdefFilter &filter,
                                                   QObject *object, const char *method)
diff --git a/src/nfc/qnearfieldtagtype3.cpp b/src/nfc/qnearfieldtagtype3.cpp
index 9c4a78f2..5b1fabf2 100644
--- a/src/nfc/qnearfieldtagtype3.cpp
+++ b/src/nfc/qnearfieldtagtype3.cpp
@@ -126,7 +126,7 @@ QNearFieldTarget::RequestId QNearFieldTagType3::writeServiceData(quint16 service
 }
 
 /*!
-    Sends the \i check request to the target. Requests the service data blocks specified by
+    Sends the \e check request to the target. Requests the service data blocks specified by
     \a serviceBlockList. Returns a request id which can be used to track the completion status of
     the request.
 
@@ -150,7 +150,7 @@ QNearFieldTarget::RequestId QNearFieldTagType3::check(const QMap<quint16, QList<
 }
 
 /*!
-    Sends the \i update request to the target. Writes \a data to the services and block indexes
+    Sends the \e update request to the target. Writes \a data to the services and block indexes
     sepecified by \a serviceBlockList. Returns a request id which can be used to track the
     completion status of the request.