diff options
author | Lars Knoll <lars.knoll@nokia.com> | 2012-03-04 21:32:40 +0100 |
---|---|---|
committer | Lars Knoll <lars.knoll@nokia.com> | 2012-03-04 21:45:05 +0100 |
commit | 96232be1466e8c059c270b611ce7c32997ff60a9 (patch) | |
tree | 9bf47c0c2c84556415eee7f938a098ae7e542649 /src/gui/text/qtextcursor.cpp | |
parent | 8db8a34f07a2f8cbd06dc0b593886a13d52ae4b1 (diff) | |
parent | fb8c95bac09910c4dfa476ab97c6206b2e94ee53 (diff) |
Merge remote-tracking branch 'origin/api_changes'
Conflicts:
dist/changes-5.0.0
mkspecs/features/qt_module_config.prf
qmake/project.cpp
qmake/property.cpp
Change-Id: I6e4af40743a9aeff8ed18533a48036e332acc296
Diffstat (limited to 'src/gui/text/qtextcursor.cpp')
-rw-r--r-- | src/gui/text/qtextcursor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qtextcursor.cpp b/src/gui/text/qtextcursor.cpp index 0dd0d99d2a..02fd921fac 100644 --- a/src/gui/text/qtextcursor.cpp +++ b/src/gui/text/qtextcursor.cpp @@ -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); |