1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QTextImageHandler: Add test coverage for resources and URLs

Browse Source 
If an image source in HTML is specified via local file name or resource
path (i.e. without qrc prefix), then the correct image is loaded.

With file:/ or qrc:/ schema however, the image is either not loaded at
all, or the 2x image is not loaded. The qt_findAtNxFile helper in
qicon.cpp gets a URL path, but expects a file path (that can be tested
with QFile::exists).

Task-number: QTBUG-109212
Change-Id: Ibcf687c69b3e53a10f21d718d28c8177a02d6be6
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit c9cf4037cafe22aa20cfea6efe1c6a4c7211d21f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Volker Hilsheimer 2022-12-21 14:30:36 +01:00
parent c35691cd1c
commit 8f19bab7b6
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/auto/gui/text/qtextimagehandler/CMakeLists.txt
View File

@ -14,3 +14,10 @@ qt_internal_add_test(tst_qtextimagehandler
TESTDATA
${test_data}
)
qt_internal_add_resource(tst_qtextimagehandler "qtextimagehandler"
PREFIX
"/"
FILES
${test_data}
)

10
tests/auto/gui/text/qtextimagehandler/tst_qtextimagehandler.cpp
View File

@ -42,6 +42,9 @@ 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()
@ -68,6 +71,13 @@ void tst_QTextImageHandler::loadAtNImages()
p.end();
QVERIFY(!img.isNull());
const auto expectedColor = dpr == 1 ? Qt::red : Qt::green;
#ifdef Q_OS_ANDROID // On Android, file:/ fails completely
QEXPECT_FAIL("file_url", "file:/ schema not handled - QTBUG-109212", Continue);
#else
if (dpr != 1)
QEXPECT_FAIL("file_url", "Nx images not resolved for file:/ schema - QTBUG-109212", Continue);
#endif
QEXPECT_FAIL("qrc_url", "qrc:/ schema not handled - QTBUG-109212", Continue);
QCOMPARE(img.pixelColor(0, 0), expectedColor);
}
}