From 78a192e58d208680f10d397b275a5b571b600749 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Fri, 14 May 2021 15:31:30 +0200 Subject: Fix BASE argument of qt_add_resources The BASE argument of qt_add_resources now denotes the root point of the alias of the file. Before, BASE was merely prepended to every file that got passed to qt_add_resources. Old behavior: qt_add_resources(app "images" PREFIX "/" BASE "../shared" FILES "images/button.png") Alias is "../shared/images/button.png", and pro2cmake generated QT_RESOURCE_ALIAS assignments to fix this. New behavior: qt_add_resources(app "images" PREFIX "/" BASE "../shared" FILES "../shared/images/button.png") The alias is "images/button.png". No extra QT_RESOURCE_ALIAS assignment is needed. The new behavior is in effect for user projects and for Qt repositories that define QT_USE_FIXED_QT_ADD_RESOURCE_BASE. Qt repositories will be ported one by one to this new behavior. Then the old code path can be removed. Task-number: QTBUG-86726 Change-Id: Ib895edd4df8e97b54badadd9a1c34408beff131f Reviewed-by: Alexandru Croitor (cherry picked from commit 92185d417de43237ae62eae55599c65922cd9a15) Reviewed-by: Qt Cherry-pick Bot --- .../qmimedatabase-cache/CMakeLists.txt | 50 ++----- .../qmimedatabase/qmimedatabase-xml/CMakeLists.txt | 50 ++----- .../plugin/qfactoryloader/test/CMakeLists.txt | 1 + .../corelib/plugin/qlibrary/tst/CMakeLists.txt | 2 + .../serialization/qtextstream/test/CMakeLists.txt | 10 +- .../access/qnetworkreply/test/CMakeLists.txt | 5 +- tests/auto/tools/rcc/CMakeLists.txt | 19 ++- .../gui/painting/lancebench/CMakeLists.txt | 89 +------------ .../graphicsview/qgraphicsview/CMakeLists.txt | 2 +- tests/manual/lance/CMakeLists.txt | 146 ++++----------------- 10 files changed, 67 insertions(+), 307 deletions(-) (limited to 'tests') diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/CMakeLists.txt b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/CMakeLists.txt index b9ce8209f7..2d7844493f 100644 --- a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/CMakeLists.txt +++ b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/CMakeLists.txt @@ -23,47 +23,17 @@ qt_internal_add_test(tst_qmimedatabase-cache #"mime/packages/freedesktop.org.xml" #) # special case end -set_source_files_properties("../invalid-magic1.xml" - PROPERTIES QT_RESOURCE_ALIAS "invalid-magic1.xml" -) -set_source_files_properties("../invalid-magic2.xml" - PROPERTIES QT_RESOURCE_ALIAS "invalid-magic2.xml" -) -set_source_files_properties("../invalid-magic3.xml" - PROPERTIES QT_RESOURCE_ALIAS "invalid-magic3.xml" -) -set_source_files_properties("../magic-and-hierarchy.foo" - PROPERTIES QT_RESOURCE_ALIAS "magic-and-hierarchy.foo" -) -set_source_files_properties("../magic-and-hierarchy.xml" - PROPERTIES QT_RESOURCE_ALIAS "magic-and-hierarchy.xml" -) -set_source_files_properties("../magic-and-hierarchy2.foo" - PROPERTIES QT_RESOURCE_ALIAS "magic-and-hierarchy2.foo" -) -set_source_files_properties("../qml-again.xml" - PROPERTIES QT_RESOURCE_ALIAS "qml-again.xml" -) -set_source_files_properties("../test.qml" - PROPERTIES QT_RESOURCE_ALIAS "test.qml" -) -set_source_files_properties("../text-x-objcsrc.xml" - PROPERTIES QT_RESOURCE_ALIAS "text-x-objcsrc.xml" -) -set_source_files_properties("../yast2-metapackage-handler-mimetypes.xml" - PROPERTIES QT_RESOURCE_ALIAS "yast2-metapackage-handler-mimetypes.xml" -) set(testdata_resource_files - "invalid-magic1.xml" - "invalid-magic2.xml" - "invalid-magic3.xml" - "magic-and-hierarchy.foo" - "magic-and-hierarchy.xml" - "magic-and-hierarchy2.foo" - "qml-again.xml" - "test.qml" - "text-x-objcsrc.xml" - "yast2-metapackage-handler-mimetypes.xml" + "../invalid-magic1.xml" + "../invalid-magic2.xml" + "../invalid-magic3.xml" + "../magic-and-hierarchy.foo" + "../magic-and-hierarchy.xml" + "../magic-and-hierarchy2.foo" + "../qml-again.xml" + "../test.qml" + "../text-x-objcsrc.xml" + "../yast2-metapackage-handler-mimetypes.xml" ) qt_internal_add_resource(tst_qmimedatabase-cache "testdata" diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/CMakeLists.txt b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/CMakeLists.txt index ddc5b99baa..47e9a2f1d7 100644 --- a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/CMakeLists.txt +++ b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/CMakeLists.txt @@ -23,47 +23,17 @@ qt_internal_add_test(tst_qmimedatabase-xml #"mime/packages/freedesktop.org.xml" #) # special case end -set_source_files_properties("../invalid-magic1.xml" - PROPERTIES QT_RESOURCE_ALIAS "invalid-magic1.xml" -) -set_source_files_properties("../invalid-magic2.xml" - PROPERTIES QT_RESOURCE_ALIAS "invalid-magic2.xml" -) -set_source_files_properties("../invalid-magic3.xml" - PROPERTIES QT_RESOURCE_ALIAS "invalid-magic3.xml" -) -set_source_files_properties("../magic-and-hierarchy.foo" - PROPERTIES QT_RESOURCE_ALIAS "magic-and-hierarchy.foo" -) -set_source_files_properties("../magic-and-hierarchy.xml" - PROPERTIES QT_RESOURCE_ALIAS "magic-and-hierarchy.xml" -) -set_source_files_properties("../magic-and-hierarchy2.foo" - PROPERTIES QT_RESOURCE_ALIAS "magic-and-hierarchy2.foo" -) -set_source_files_properties("../qml-again.xml" - PROPERTIES QT_RESOURCE_ALIAS "qml-again.xml" -) -set_source_files_properties("../test.qml" - PROPERTIES QT_RESOURCE_ALIAS "test.qml" -) -set_source_files_properties("../text-x-objcsrc.xml" - PROPERTIES QT_RESOURCE_ALIAS "text-x-objcsrc.xml" -) -set_source_files_properties("../yast2-metapackage-handler-mimetypes.xml" - PROPERTIES QT_RESOURCE_ALIAS "yast2-metapackage-handler-mimetypes.xml" -) set(testdata_resource_files - "invalid-magic1.xml" - "invalid-magic2.xml" - "invalid-magic3.xml" - "magic-and-hierarchy.foo" - "magic-and-hierarchy.xml" - "magic-and-hierarchy2.foo" - "qml-again.xml" - "test.qml" - "text-x-objcsrc.xml" - "yast2-metapackage-handler-mimetypes.xml" + "../invalid-magic1.xml" + "../invalid-magic2.xml" + "../invalid-magic3.xml" + "../magic-and-hierarchy.foo" + "../magic-and-hierarchy.xml" + "../magic-and-hierarchy2.foo" + "../qml-again.xml" + "../test.qml" + "../text-x-objcsrc.xml" + "../yast2-metapackage-handler-mimetypes.xml" ) qt_internal_add_resource(tst_qmimedatabase-xml "testdata" diff --git a/tests/auto/corelib/plugin/qfactoryloader/test/CMakeLists.txt b/tests/auto/corelib/plugin/qfactoryloader/test/CMakeLists.txt index 8515af2beb..675dbbd684 100644 --- a/tests/auto/corelib/plugin/qfactoryloader/test/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qfactoryloader/test/CMakeLists.txt @@ -55,6 +55,7 @@ if(ANDROID) bin/libplugin2.so ) endif() + list(TRANSFORM qmake_libs_resource_files PREPEND "${CMAKE_CURRENT_BINARY_DIR}/../") # special case end qt_internal_add_resource(tst_qfactoryloader "qmake_libs" diff --git a/tests/auto/corelib/plugin/qlibrary/tst/CMakeLists.txt b/tests/auto/corelib/plugin/qlibrary/tst/CMakeLists.txt index ef062a53a2..73c05aeebe 100644 --- a/tests/auto/corelib/plugin/qlibrary/tst/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qlibrary/tst/CMakeLists.txt @@ -40,6 +40,8 @@ if(ANDROID) # special case end ) + list(TRANSFORM qmake_libs_resource_files PREPEND "${CMAKE_CURRENT_BINARY_DIR}/../") + qt_internal_add_resource(tst_qlibrary "qmake_libs" PREFIX "android_test_data" diff --git a/tests/auto/corelib/serialization/qtextstream/test/CMakeLists.txt b/tests/auto/corelib/serialization/qtextstream/test/CMakeLists.txt index c90a6f12c5..2dccf09ac4 100644 --- a/tests/auto/corelib/serialization/qtextstream/test/CMakeLists.txt +++ b/tests/auto/corelib/serialization/qtextstream/test/CMakeLists.txt @@ -23,15 +23,9 @@ qt_internal_add_test(tst_qtextstream ) # Resources: -set_source_files_properties("../resources/big_endian/" - PROPERTIES QT_RESOURCE_ALIAS "resources/big_endian/" -) -set_source_files_properties("../resources/little_endian/" - PROPERTIES QT_RESOURCE_ALIAS "resources/little_endian/" -) set(qtextstream_resource_files - "resources/big_endian/" - "resources/little_endian/" + "../resources/big_endian/" + "../resources/little_endian/" ) qt_internal_add_resource(tst_qtextstream "qtextstream" diff --git a/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt b/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt index d1b664e2d6..17ce3c5c16 100644 --- a/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt +++ b/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt @@ -29,11 +29,8 @@ qt_internal_add_test(tst_qnetworkreply ) # Resources: -set_source_files_properties("../resource" - PROPERTIES QT_RESOURCE_ALIAS "resource" -) set(qnetworkreply_resource_files - "resource" + "../resource" ) qt_internal_add_resource(tst_qnetworkreply "qnetworkreply" diff --git a/tests/auto/tools/rcc/CMakeLists.txt b/tests/auto/tools/rcc/CMakeLists.txt index 40b91baa3a..abcf3a1f60 100644 --- a/tests/auto/tools/rcc/CMakeLists.txt +++ b/tests/auto/tools/rcc/CMakeLists.txt @@ -11,9 +11,9 @@ qt_internal_add_test(tst_rcc # Resources: set(images_resource_files - "images/circle.png" - "images/square.png" - "images/subdir/triangle.png" + "data/images/images/circle.png" + "data/images/images/square.png" + "data/images/images/subdir/triangle.png" ) qt_internal_add_resource(tst_rcc "images" @@ -25,7 +25,7 @@ qt_internal_add_resource(tst_rcc "images" ${images_resource_files} ) set(size-0_resource_files - "data/data-0.txt" + "data/sizes/data/data-0.txt" ) qt_internal_add_resource(tst_rcc "size-0" @@ -37,10 +37,10 @@ qt_internal_add_resource(tst_rcc "size-0" ${size-0_resource_files} ) set(size-2-0-35-1_resource_files - "data/data-0.txt" - "data/data-1.txt" - "data/data-2.txt" - "data/data-35.txt" + "data/sizes/data/data-0.txt" + "data/sizes/data/data-1.txt" + "data/sizes/data/data-2.txt" + "data/sizes/data/data-35.txt" ) qt_internal_add_resource(tst_rcc "size-2-0-35-1" @@ -52,7 +52,7 @@ qt_internal_add_resource(tst_rcc "size-2-0-35-1" ${size-2-0-35-1_resource_files} ) set(size-1_resource_files - "data/data-1.txt" + "data/sizes/data/data-1.txt" ) qt_internal_add_resource(tst_rcc "size-1" @@ -63,4 +63,3 @@ qt_internal_add_resource(tst_rcc "size-1" FILES ${size-1_resource_files} ) - diff --git a/tests/benchmarks/gui/painting/lancebench/CMakeLists.txt b/tests/benchmarks/gui/painting/lancebench/CMakeLists.txt index 2807332cca..e278f0ddc0 100644 --- a/tests/benchmarks/gui/painting/lancebench/CMakeLists.txt +++ b/tests/benchmarks/gui/painting/lancebench/CMakeLists.txt @@ -15,93 +15,6 @@ qt_internal_add_benchmark(tst_bench_lancebench ) # Resources: -set_source_files_properties("../../../../auto/other/lancelot/images/alpha.png" - PROPERTIES QT_RESOURCE_ALIAS "images/alpha.png" -) -set_source_files_properties("../../../../auto/other/lancelot/images/alpha2x2.png" - PROPERTIES QT_RESOURCE_ALIAS "images/alpha2x2.png" -) -set_source_files_properties("../../../../auto/other/lancelot/images/bitmap.png" - PROPERTIES QT_RESOURCE_ALIAS "images/bitmap.png" -) -set_source_files_properties("../../../../auto/other/lancelot/images/border.png" - PROPERTIES QT_RESOURCE_ALIAS "images/border.png" -) -set_source_files_properties("../../../../auto/other/lancelot/images/borderimage.png" - PROPERTIES QT_RESOURCE_ALIAS "images/borderimage.png" -) -set_source_files_properties("../../../../auto/other/lancelot/images/dome_argb32.png" - PROPERTIES QT_RESOURCE_ALIAS "images/dome_argb32.png" -) -set_source_files_properties("../../../../auto/other/lancelot/images/dome_indexed.png" - PROPERTIES QT_RESOURCE_ALIAS "images/dome_indexed.png" -) -set_source_files_properties("../../../../auto/other/lancelot/images/dome_indexed_mask.png" - PROPERTIES QT_RESOURCE_ALIAS "images/dome_indexed_mask.png" -) -set_source_files_properties("../../../../auto/other/lancelot/images/dome_mono.png" - PROPERTIES QT_RESOURCE_ALIAS "images/dome_mono.png" -) -set_source_files_properties("../../../../auto/other/lancelot/images/dome_mono_128.png" - PROPERTIES QT_RESOURCE_ALIAS "images/dome_mono_128.png" -) -set_source_files_properties("../../../../auto/other/lancelot/images/dome_mono_palette.png" - PROPERTIES QT_RESOURCE_ALIAS "images/dome_mono_palette.png" -) -set_source_files_properties("../../../../auto/other/lancelot/images/dome_rgb32.png" - PROPERTIES QT_RESOURCE_ALIAS "images/dome_rgb32.png" -) -set_source_files_properties("../../../../auto/other/lancelot/images/dot.png" - PROPERTIES QT_RESOURCE_ALIAS "images/dot.png" -) -set_source_files_properties("../../../../auto/other/lancelot/images/face.png" - PROPERTIES QT_RESOURCE_ALIAS "images/face.png" -) -set_source_files_properties("../../../../auto/other/lancelot/images/gam030.png" - PROPERTIES QT_RESOURCE_ALIAS "images/gam030.png" -) -set_source_files_properties("../../../../auto/other/lancelot/images/gam045.png" - PROPERTIES QT_RESOURCE_ALIAS "images/gam045.png" -) -set_source_files_properties("../../../../auto/other/lancelot/images/gam056.png" - PROPERTIES QT_RESOURCE_ALIAS "images/gam056.png" -) -set_source_files_properties("../../../../auto/other/lancelot/images/gam100.png" - PROPERTIES QT_RESOURCE_ALIAS "images/gam100.png" -) -set_source_files_properties("../../../../auto/other/lancelot/images/gam200.png" - PROPERTIES QT_RESOURCE_ALIAS "images/gam200.png" -) -set_source_files_properties("../../../../auto/other/lancelot/images/image.png" - PROPERTIES QT_RESOURCE_ALIAS "images/image.png" -) -set_source_files_properties("../../../../auto/other/lancelot/images/mask.png" - PROPERTIES QT_RESOURCE_ALIAS "images/mask.png" -) -set_source_files_properties("../../../../auto/other/lancelot/images/mask_100.png" - PROPERTIES QT_RESOURCE_ALIAS "images/mask_100.png" -) -set_source_files_properties("../../../../auto/other/lancelot/images/masked.png" - PROPERTIES QT_RESOURCE_ALIAS "images/masked.png" -) -set_source_files_properties("../../../../auto/other/lancelot/images/sign.png" - PROPERTIES QT_RESOURCE_ALIAS "images/sign.png" -) -set_source_files_properties("../../../../auto/other/lancelot/images/solid.png" - PROPERTIES QT_RESOURCE_ALIAS "images/solid.png" -) -set_source_files_properties("../../../../auto/other/lancelot/images/solid2x2.png" - PROPERTIES QT_RESOURCE_ALIAS "images/solid2x2.png" -) -set_source_files_properties("../../../../auto/other/lancelot/images/struct-image-01.jpg" - PROPERTIES QT_RESOURCE_ALIAS "images/struct-image-01.jpg" -) -set_source_files_properties("../../../../auto/other/lancelot/images/struct-image-01.png" - PROPERTIES QT_RESOURCE_ALIAS "images/struct-image-01.png" -) -set_source_files_properties("../../../../auto/other/lancelot/images/zebra.png" - PROPERTIES QT_RESOURCE_ALIAS "images/zebra.png" -) set(images_resource_files "images/alpha.png" "images/alpha2x2.png" @@ -134,6 +47,8 @@ set(images_resource_files "images/zebra.png" ) +list(TRANSFORM images_resource_files PREPEND "../../../../auto/other/lancelot/") + qt_internal_add_resource(tst_bench_lancebench "images" PREFIX "/" diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsview/CMakeLists.txt b/tests/benchmarks/widgets/graphicsview/qgraphicsview/CMakeLists.txt index 178e5dc125..60509247e3 100644 --- a/tests/benchmarks/widgets/graphicsview/qgraphicsview/CMakeLists.txt +++ b/tests/benchmarks/widgets/graphicsview/qgraphicsview/CMakeLists.txt @@ -30,7 +30,7 @@ qt_internal_add_resource(tst_bench_qgraphicsview "qgraphicsview" ${qgraphicsview_resource_files} ) set(images_resource_files - "qt4logo.png" + "chiptester/qt4logo.png" ) qt_internal_add_resource(tst_bench_qgraphicsview "images" diff --git a/tests/manual/lance/CMakeLists.txt b/tests/manual/lance/CMakeLists.txt index 568aeaa6e7..02b7273be4 100644 --- a/tests/manual/lance/CMakeLists.txt +++ b/tests/manual/lance/CMakeLists.txt @@ -34,125 +34,37 @@ qt_internal_add_resource(lance "icons" FILES ${icons_resource_files} ) -set_source_files_properties("../../auto/other/lancelot/images/alpha.png" - PROPERTIES QT_RESOURCE_ALIAS "images/alpha.png" -) -set_source_files_properties("../../auto/other/lancelot/images/alpha2x2.png" - PROPERTIES QT_RESOURCE_ALIAS "images/alpha2x2.png" -) -set_source_files_properties("../../auto/other/lancelot/images/bitmap.png" - PROPERTIES QT_RESOURCE_ALIAS "images/bitmap.png" -) -set_source_files_properties("../../auto/other/lancelot/images/border.png" - PROPERTIES QT_RESOURCE_ALIAS "images/border.png" -) -set_source_files_properties("../../auto/other/lancelot/images/borderimage.png" - PROPERTIES QT_RESOURCE_ALIAS "images/borderimage.png" -) -set_source_files_properties("../../auto/other/lancelot/images/dome_argb32.png" - PROPERTIES QT_RESOURCE_ALIAS "images/dome_argb32.png" -) -set_source_files_properties("../../auto/other/lancelot/images/dome_indexed.png" - PROPERTIES QT_RESOURCE_ALIAS "images/dome_indexed.png" -) -set_source_files_properties("../../auto/other/lancelot/images/dome_indexed_mask.png" - PROPERTIES QT_RESOURCE_ALIAS "images/dome_indexed_mask.png" -) -set_source_files_properties("../../auto/other/lancelot/images/dome_mono.png" - PROPERTIES QT_RESOURCE_ALIAS "images/dome_mono.png" -) -set_source_files_properties("../../auto/other/lancelot/images/dome_mono_128.png" - PROPERTIES QT_RESOURCE_ALIAS "images/dome_mono_128.png" -) -set_source_files_properties("../../auto/other/lancelot/images/dome_mono_palette.png" - PROPERTIES QT_RESOURCE_ALIAS "images/dome_mono_palette.png" -) -set_source_files_properties("../../auto/other/lancelot/images/dome_rgb32.png" - PROPERTIES QT_RESOURCE_ALIAS "images/dome_rgb32.png" -) -set_source_files_properties("../../auto/other/lancelot/images/dot.png" - PROPERTIES QT_RESOURCE_ALIAS "images/dot.png" -) -set_source_files_properties("../../auto/other/lancelot/images/face.png" - PROPERTIES QT_RESOURCE_ALIAS "images/face.png" -) -set_source_files_properties("../../auto/other/lancelot/images/gam030.png" - PROPERTIES QT_RESOURCE_ALIAS "images/gam030.png" -) -set_source_files_properties("../../auto/other/lancelot/images/gam045.png" - PROPERTIES QT_RESOURCE_ALIAS "images/gam045.png" -) -set_source_files_properties("../../auto/other/lancelot/images/gam056.png" - PROPERTIES QT_RESOURCE_ALIAS "images/gam056.png" -) -set_source_files_properties("../../auto/other/lancelot/images/gam100.png" - PROPERTIES QT_RESOURCE_ALIAS "images/gam100.png" -) -set_source_files_properties("../../auto/other/lancelot/images/gam200.png" - PROPERTIES QT_RESOURCE_ALIAS "images/gam200.png" -) -set_source_files_properties("../../auto/other/lancelot/images/image.png" - PROPERTIES QT_RESOURCE_ALIAS "images/image.png" -) -set_source_files_properties("../../auto/other/lancelot/images/mask.png" - PROPERTIES QT_RESOURCE_ALIAS "images/mask.png" -) -set_source_files_properties("../../auto/other/lancelot/images/mask_100.png" - PROPERTIES QT_RESOURCE_ALIAS "images/mask_100.png" -) -set_source_files_properties("../../auto/other/lancelot/images/masked.png" - PROPERTIES QT_RESOURCE_ALIAS "images/masked.png" -) -set_source_files_properties("../../auto/other/lancelot/images/sign.png" - PROPERTIES QT_RESOURCE_ALIAS "images/sign.png" -) -set_source_files_properties("../../auto/other/lancelot/images/solid.png" - PROPERTIES QT_RESOURCE_ALIAS "images/solid.png" -) -set_source_files_properties("../../auto/other/lancelot/images/solid2x2.png" - PROPERTIES QT_RESOURCE_ALIAS "images/solid2x2.png" -) -set_source_files_properties("../../auto/other/lancelot/images/struct-image-01.jpg" - PROPERTIES QT_RESOURCE_ALIAS "images/struct-image-01.jpg" -) -set_source_files_properties("../../auto/other/lancelot/images/struct-image-01.png" - PROPERTIES QT_RESOURCE_ALIAS "images/struct-image-01.png" -) -set_source_files_properties("../../auto/other/lancelot/images/zebra.png" - PROPERTIES QT_RESOURCE_ALIAS "images/zebra.png" -) set(images_resource_files - "images/alpha.png" - "images/alpha2x2.png" - "images/bitmap.png" - "images/border.png" - "images/borderimage.png" - "images/dome_argb32.png" - "images/dome_indexed.png" - "images/dome_indexed_mask.png" - "images/dome_mono.png" - "images/dome_mono_128.png" - "images/dome_mono_palette.png" - "images/dome_rgb32.png" - "images/dot.png" - "images/face.png" - "images/gam030.png" - "images/gam045.png" - "images/gam056.png" - "images/gam100.png" - "images/gam200.png" - "images/image.png" - "images/mask.png" - "images/mask_100.png" - "images/masked.png" - "images/sign.png" - "images/solid.png" - "images/solid2x2.png" - "images/struct-image-01.jpg" - "images/struct-image-01.png" - "images/zebra.png" + "../../auto/other/lancelot/images/alpha.png" + "../../auto/other/lancelot/images/alpha2x2.png" + "../../auto/other/lancelot/images/bitmap.png" + "../../auto/other/lancelot/images/border.png" + "../../auto/other/lancelot/images/borderimage.png" + "../../auto/other/lancelot/images/dome_argb32.png" + "../../auto/other/lancelot/images/dome_indexed.png" + "../../auto/other/lancelot/images/dome_indexed_mask.png" + "../../auto/other/lancelot/images/dome_mono.png" + "../../auto/other/lancelot/images/dome_mono_128.png" + "../../auto/other/lancelot/images/dome_mono_palette.png" + "../../auto/other/lancelot/images/dome_rgb32.png" + "../../auto/other/lancelot/images/dot.png" + "../../auto/other/lancelot/images/face.png" + "../../auto/other/lancelot/images/gam030.png" + "../../auto/other/lancelot/images/gam045.png" + "../../auto/other/lancelot/images/gam056.png" + "../../auto/other/lancelot/images/gam100.png" + "../../auto/other/lancelot/images/gam200.png" + "../../auto/other/lancelot/images/image.png" + "../../auto/other/lancelot/images/mask.png" + "../../auto/other/lancelot/images/mask_100.png" + "../../auto/other/lancelot/images/masked.png" + "../../auto/other/lancelot/images/sign.png" + "../../auto/other/lancelot/images/solid.png" + "../../auto/other/lancelot/images/solid2x2.png" + "../../auto/other/lancelot/images/struct-image-01.jpg" + "../../auto/other/lancelot/images/struct-image-01.png" + "../../auto/other/lancelot/images/zebra.png" ) - qt_internal_add_resource(lance "images" PREFIX "/" -- cgit v1.2.3