2d87c4d881
The qt_findAtNxFile helper in qicon.cpp expects a local file name that
can be probed with QFile::exists. If the src attribute of an <img>
element specifies the location of the image as a file:/ or qrc:/ url
rather than as a local file name, then we need to strip the scheme
off the file path, and in the case of a qrc URL leave the :/ prefix
before calling the qt_findAtNxFile helper.
Amends, and partially reverts, 760df72565.
We can't avoid testing whether the source in the HTML is provided as a
URL before interpreting it as a file name.
Pick-to: 6.5 6.4 6.2
Fixes: QTBUG-109212
Change-Id: I7ea7a5bfde79bab90a8025c42e754129813dd0fc
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
80 lines
2.0 KiB
C++
80 lines
2.0 KiB
C++
// Copyright (C) 2022 The Qt Company Ltd.
|
|
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
|
|
|
|
#include <QTest>
|
|
|
|
#include <QPainter>
|
|
#include <private/qtextimagehandler_p.h>
|
|
|
|
class tst_QTextImageHandler : public QObject
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
tst_QTextImageHandler();
|
|
|
|
private slots:
|
|
void init();
|
|
void cleanup();
|
|
void cleanupTestCase();
|
|
void loadAtNImages_data();
|
|
void loadAtNImages();
|
|
};
|
|
|
|
tst_QTextImageHandler::tst_QTextImageHandler()
|
|
{
|
|
}
|
|
|
|
void tst_QTextImageHandler::init()
|
|
{
|
|
}
|
|
|
|
void tst_QTextImageHandler::cleanup()
|
|
{
|
|
}
|
|
|
|
void tst_QTextImageHandler::cleanupTestCase()
|
|
{
|
|
}
|
|
|
|
void tst_QTextImageHandler::loadAtNImages_data()
|
|
{
|
|
QTest::addColumn<QString>("imageFile");
|
|
|
|
QTest::addRow("file") << QFINDTESTDATA("data/image.png");
|
|
QTest::addRow("file_url") << QString("file:/") + QFINDTESTDATA("data/image.png");
|
|
QTest::addRow("resource") << ":/data/image.png";
|
|
QTest::addRow("qrc_url") << "qrc:/data/image.png";
|
|
}
|
|
|
|
void tst_QTextImageHandler::loadAtNImages()
|
|
{
|
|
QFETCH(QString, imageFile);
|
|
|
|
QTextDocument doc;
|
|
QTextCursor c(&doc);
|
|
c.insertHtml("<img src=\"" + imageFile + "\">");
|
|
const auto formats = doc.allFormats();
|
|
const auto it = std::find_if(formats.begin(), formats.end(), [](const auto &format){
|
|
return format.objectType() == QTextFormat::ImageObject;
|
|
});
|
|
QVERIFY(it != formats.end());
|
|
const QTextImageFormat format = (*it).toImageFormat();
|
|
QTextImageHandler handler;
|
|
|
|
for (const auto &dpr : {1, 2}) {
|
|
QImage img(20, 20, QImage::Format_ARGB32_Premultiplied);
|
|
img.fill(Qt::white);
|
|
img.setDevicePixelRatio(dpr);
|
|
QPainter p(&img);
|
|
handler.drawObject(&p, QRect(0, 0, 20, 20), &doc, 0, format);
|
|
p.end();
|
|
QVERIFY(!img.isNull());
|
|
const auto expectedColor = dpr == 1 ? Qt::red : Qt::green;
|
|
QCOMPARE(img.pixelColor(0, 0), expectedColor);
|
|
}
|
|
}
|
|
|
|
QTEST_MAIN(tst_QTextImageHandler)
|
|
#include "tst_qtextimagehandler.moc"
|