amass/qt-build-tools
1
0
Fork 0
mirror of https://github.com/crystalidea/qt-build-tools.git synced 2024-11-29 14:45:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

5.15.1: fix for QTBUG-52697

Browse Source
This commit is contained in:
kleuter 2020-10-12 20:49:59 +02:00
parent 26e93867d0
commit e6fd3726f1
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
5.15.1/qtbase/src/gui/text/qtextimagehandler.cpp
View File

@ -87,6 +87,10 @@ static QPixmap getPixmap(QTextDocument *doc, const QTextImageFormat &format, con
QUrl url = QUrl(name); QUrl url = QUrl(name);
qreal sourcePixelRatio = 1.0; qreal sourcePixelRatio = 1.0;
name = resolveFileName(name, &url, devicePixelRatio, &sourcePixelRatio); name = resolveFileName(name, &url, devicePixelRatio, &sourcePixelRatio);
if (name.contains(QLatin1String("@2x")))
url = QUrl(name); // url must be updated! (QTBUG-52697)
const QVariant data = doc->resource(QTextDocument::ImageResource, url); const QVariant data = doc->resource(QTextDocument::ImageResource, url);
if (data.userType() == QMetaType::QPixmap || data.userType() == QMetaType::QImage) { if (data.userType() == QMetaType::QPixmap || data.userType() == QMetaType::QImage) {
pm = qvariant_cast<QPixmap>(data); pm = qvariant_cast<QPixmap>(data);
@ -169,6 +173,10 @@ static QImage getImage(QTextDocument *doc, const QTextImageFormat &format, const
QUrl url = QUrl(name); QUrl url = QUrl(name);
qreal sourcePixelRatio = 1.0; qreal sourcePixelRatio = 1.0;
name = resolveFileName(name, &url, devicePixelRatio, &sourcePixelRatio); name = resolveFileName(name, &url, devicePixelRatio, &sourcePixelRatio);
if (name.contains(QLatin1String("@2x")))
url = QUrl(name); // url must be updated! (QTBUG-52697)
const QVariant data = doc->resource(QTextDocument::ImageResource, url); const QVariant data = doc->resource(QTextDocument::ImageResource, url);
if (data.userType() == QMetaType::QImage) { if (data.userType() == QMetaType::QImage) {
image = qvariant_cast<QImage>(data); image = qvariant_cast<QImage>(data);