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/src/gui/text/qtextcursor.cpp b/src/gui/text/qtextcursor.cpp
index ddf2fb080e..02fd921fac 100644
--- a/src/gui/text/qtextcursor.cpp
+++ b/src/gui/text/qtextcursor.cpp
@@ -950,15 +950,15 @@ QTextLayout *QTextCursorPrivate::blockLayout(QTextBlock &block) const{
     document with the cursor:
 
     \list
-    \i Lists are ordered sequences of block elements that are decorated with
+    \li Lists are ordered sequences of block elements that are decorated with
        bullet points or symbols. These are inserted in a specified format
        with insertList().
-    \i Tables are inserted with the insertTable() function, and can be
+    \li Tables are inserted with the insertTable() function, and can be
        given an optional format. These contain an array of cells that can
        be traversed using the cursor.
-    \i Inline images are inserted with insertImage(). The image to be
+    \li Inline images are inserted with insertImage(). The image to be
        used can be specified in an image format, or by name.
-    \i Frames are inserted by calling insertFrame() with a specified format.
+    \li Frames are inserted by calling insertFrame() with a specified format.
     \endlist
 
     Actions can be grouped (i.e. treated as a single action for
@@ -1621,7 +1621,7 @@ void QTextCursor::selectedTableCells(int *firstRow, int *numRows, int *firstColu
 /*!
     Clears the current selection by setting the anchor to the cursor position.
 
-    Note that it does \bold{not} delete the text of the selection.
+    Note that it does \b{not} delete the text of the selection.
 
     \sa removeSelectedText() hasSelection()
 */
@@ -2325,7 +2325,7 @@ void QTextCursor::insertImage(const QImage &image, const QString &name)
     }
     QString imageName = name;
     if (name.isEmpty())
-        imageName = QString::number(image.serialNumber());
+        imageName = QString::number(image.cacheKey());
     d->priv->document()->addResource(QTextDocument::ImageResource, QUrl(imageName), image);
     QTextImageFormat format;
     format.setName(imageName);