diff options
author | Tatiana Borisova <tatiana.borisova@qt.io> | 2021-12-23 15:12:05 +0200 |
---|---|---|
committer | Tatiana Borisova <tatiana.borisova@qt.io> | 2022-01-13 16:29:23 +0000 |
commit | f35dab51d7f222c98717e0d31224a6cdabfe804d (patch) | |
tree | 728fd038cfb2d28084a930a8999b4eb4d708f9e6 /tests/auto/qsvgrenderer | |
parent | a2dfe10e9da9d5a65ce0c31bffa8350a82232bc1 (diff) | |
download | qtsvg-f35dab51d7f222c98717e0d31224a6cdabfe804d.tar.gz |
Fix tst_qicon_svg, tst_qsvgplugin, tst_qsvgrenderer runtime failures
- add resources to binary for INTEGRITY (IGY is static build only)
Task-number: QTBUG-99123
Pick-to: 6.2 6.3
Change-Id: If33215406210bb84be3b526bdae9d88ff04170f0
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
Diffstat (limited to 'tests/auto/qsvgrenderer')
-rw-r--r-- | tests/auto/qsvgrenderer/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tests/auto/qsvgrenderer/resources.qrc | 2 | ||||
-rw-r--r-- | tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp | 8 |
3 files changed, 8 insertions, 4 deletions
diff --git a/tests/auto/qsvgrenderer/CMakeLists.txt b/tests/auto/qsvgrenderer/CMakeLists.txt index 26d263e..d64f137 100644 --- a/tests/auto/qsvgrenderer/CMakeLists.txt +++ b/tests/auto/qsvgrenderer/CMakeLists.txt @@ -19,6 +19,8 @@ qt_internal_add_test(tst_qsvgrenderer # Resources: set(resources_resource_files "heart.svgz" + "large.svg" + "large.svgz" ) qt_internal_add_resource(tst_qsvgrenderer "resources" diff --git a/tests/auto/qsvgrenderer/resources.qrc b/tests/auto/qsvgrenderer/resources.qrc index d666bcf..5f6a1ab 100644 --- a/tests/auto/qsvgrenderer/resources.qrc +++ b/tests/auto/qsvgrenderer/resources.qrc @@ -1,5 +1,7 @@ <!DOCTYPE RCC><RCC version="1.0"> <qresource> <file>heart.svgz</file> + <file>large.svg</file> + <file>large.svgz</file> </qresource> </RCC> diff --git a/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp b/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp index fca52ea..0315d91 100644 --- a/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp +++ b/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp @@ -809,13 +809,13 @@ void tst_QSvgRenderer::recursiveRefs() #ifndef QT_NO_COMPRESS void tst_QSvgRenderer::testGzLoading() { - QSvgRenderer renderer(QLatin1String(SRCDIR "heart.svgz")); + QSvgRenderer renderer(QFINDTESTDATA("heart.svgz")); QVERIFY(renderer.isValid()); QSvgRenderer resourceRenderer(QLatin1String(":/heart.svgz")); QVERIFY(resourceRenderer.isValid()); - QFile largeFileGz(SRCDIR "large.svgz"); + QFile largeFileGz(QFINDTESTDATA("large.svgz")); largeFileGz.open(QIODevice::ReadOnly); QByteArray data = largeFileGz.readAll(); QSvgRenderer autoDetectGzData(data); @@ -837,9 +837,9 @@ void tst_QSvgRenderer::testGzHelper_data() QTest::newRow("small") << QByteArray::fromHex(QByteArray("1f8b08005819934800034b" "cbcfe70200a865327e04000000")) << QByteArray("foo\n"); - QFile largeFileGz("large.svgz"); + QFile largeFileGz(QFINDTESTDATA("large.svgz")); largeFileGz.open(QIODevice::ReadOnly); - QFile largeFile("large.svg"); + QFile largeFile(QFINDTESTDATA("large.svg")); largeFile.open(QIODevice::ReadOnly); QTest::newRow("large") << largeFileGz.readAll() << largeFile.readAll(); |