diff options
Diffstat (limited to 'tests/auto/corelib')
5 files changed, 25 insertions, 88 deletions
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" |