diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-31 01:00:06 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-31 01:00:06 +0100 |
| commit | c6c3613af3229b818b37482bfe285bbdb2e09e85 (patch) | |
| tree | 9ba2466de0f426b5e7c666c053e9a0aa6a32d3b8 /src/quick/items/qquicktext.cpp | |
| parent | e898490b4e6d6f85ea826a4e864b602e361fb7e5 (diff) | |
| parent | f7647d5adaaed4c651cb2e65c7ce66d7ef6639f1 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I55a13797b753d2598f6f7cf817bba0d7768e37a3
Diffstat (limited to 'src/quick/items/qquicktext.cpp')
| -rw-r--r-- | src/quick/items/qquicktext.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp index 2a6337cdb3..f89e7d970f 100644 --- a/src/quick/items/qquicktext.cpp +++ b/src/quick/items/qquicktext.cpp @@ -1212,7 +1212,7 @@ void QQuickTextPrivate::setLineGeometry(QTextLine &line, qreal lineWidth, qreal if (!image->pix) { QUrl url = q->baseUrl().resolved(image->url); - image->pix = new QQuickPixmap(qmlEngine(q), url, image->size); + image->pix = new QQuickPixmap(qmlEngine(q), url, QRect(), image->size); if (image->pix->isLoading()) { image->pix->connectFinished(q, SLOT(imageDownloadFinished())); if (!extra.isAllocated() || !extra->nbActiveDownloads) |