Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-imageformats for openSUSE:Factory checked in at 2021-06-15 16:37:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-imageformats (Old) and /work/SRC/openSUSE:Factory/.qt6-imageformats.new.32437 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-imageformats" Tue Jun 15 16:37:58 2021 rev:5 rq:900092 version:6.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-imageformats/qt6-imageformats.changes 2021-05-10 15:40:56.689188617 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-imageformats.new.32437/qt6-imageformats.changes 2021-06-15 16:38:34.293821773 +0200 @@ -1,0 +2,6 @@ +Tue Jun 8 05:54:11 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 6.1.1: + * https://www.qt.io/blog/qt-6.1.1-released + +------------------------------------------------------------------- Old: ---- qtimageformats-everywhere-src-6.1.0.tar.xz New: ---- qtimageformats-everywhere-src-6.1.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-imageformats.spec ++++++ --- /var/tmp/diff_new_pack.ciI8wf/_old 2021-06-15 16:38:34.845822730 +0200 +++ /var/tmp/diff_new_pack.ciI8wf/_new 2021-06-15 16:38:34.845822730 +0200 @@ -16,7 +16,7 @@ # -%define real_version 6.1.0 +%define real_version 6.1.1 %define short_version 6.1 %define short_name qtimageformats %define tar_name qtimageformats-everywhere-src @@ -28,7 +28,7 @@ %endif # Name: qt6-imageformats%{?pkg_suffix} -Version: 6.1.0 +Version: 6.1.1 Release: 0 Summary: Qt 6 ImageFormat Plugins License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) ++++++ qtimageformats-everywhere-src-6.1.0.tar.xz -> qtimageformats-everywhere-src-6.1.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.1.0/.cmake.conf new/qtimageformats-everywhere-src-6.1.1/.cmake.conf --- old/qtimageformats-everywhere-src-6.1.0/.cmake.conf 2021-05-03 11:49:13.000000000 +0200 +++ new/qtimageformats-everywhere-src-6.1.1/.cmake.conf 2021-06-02 06:27:46.000000000 +0200 @@ -1 +1 @@ -set(QT_REPO_MODULE_VERSION "6.1.0") +set(QT_REPO_MODULE_VERSION "6.1.1") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.1.0/.qmake.conf new/qtimageformats-everywhere-src-6.1.1/.qmake.conf --- old/qtimageformats-everywhere-src-6.1.0/.qmake.conf 2021-05-03 11:49:13.000000000 +0200 +++ new/qtimageformats-everywhere-src-6.1.1/.qmake.conf 2021-06-02 06:27:46.000000000 +0200 @@ -2,5 +2,5 @@ DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS -MODULE_VERSION = 6.1.0 +MODULE_VERSION = 6.1.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.1.0/.tag new/qtimageformats-everywhere-src-6.1.1/.tag --- old/qtimageformats-everywhere-src-6.1.0/.tag 2021-05-03 11:49:13.000000000 +0200 +++ new/qtimageformats-everywhere-src-6.1.1/.tag 2021-06-02 06:27:46.000000000 +0200 @@ -1 +1 @@ -e26917ebf0221c9f6ab5575ca95ae0df1e80b3fb +da0e08acfbe61322aac0e5b472358f9124a8e42e diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.1.0/CMakeLists.txt new/qtimageformats-everywhere-src-6.1.1/CMakeLists.txt --- old/qtimageformats-everywhere-src-6.1.0/CMakeLists.txt 2021-05-03 11:49:13.000000000 +0200 +++ new/qtimageformats-everywhere-src-6.1.1/CMakeLists.txt 2021-06-02 06:27:46.000000000 +0200 @@ -13,6 +13,9 @@ # special case begin # Make sure we only use latest private CMake API, aka no compatibility wrappers. set(QT_NO_INTERNAL_COMPATIBILITY_FUNCTIONS TRUE) + +# Make sure we use the fixed BASE argument of qt_add_resource. +set(QT_USE_FIXED_QT_ADD_RESOURCE_BASE TRUE) # special case end find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core) # special case diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.1.0/cmake/FindWrapWebP.cmake new/qtimageformats-everywhere-src-6.1.1/cmake/FindWrapWebP.cmake --- old/qtimageformats-everywhere-src-6.1.0/cmake/FindWrapWebP.cmake 2021-05-03 11:49:13.000000000 +0200 +++ new/qtimageformats-everywhere-src-6.1.1/cmake/FindWrapWebP.cmake 2021-06-02 06:27:46.000000000 +0200 @@ -20,7 +20,7 @@ return() endif() -find_package(PkgConfig) +find_package(PkgConfig QUIET) pkg_check_modules(PC_WebP libwebp) pkg_check_modules(PC_WebPDemux libwebpdemux) pkg_check_modules(PC_WebPMux libwebpmux) @@ -40,13 +40,13 @@ HINTS ${PC_WebPMux_INCLUDEDIR}) include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(WebP DEFAULT_MSG WebP_INCLUDE_DIR WebP_LIBRARY - WebP_demux_INCLUDE_DIR WebP_demux_LIBRARY - WebP_mux_INCLUDE_DIR WebP_mux_LIBRARY) +find_package_handle_standard_args(WrapWebP DEFAULT_MSG WebP_INCLUDE_DIR WebP_LIBRARY + WebP_demux_INCLUDE_DIR WebP_demux_LIBRARY + WebP_mux_INCLUDE_DIR WebP_mux_LIBRARY) mark_as_advanced(WebP_INCLUDE_DIR WebP_LIBRARY WebP_demux_INCLUDE_DIR WebP_demux_LIBRARY WebP_mux_INCLUDE_DIR WebP_mux_LIBRARY) -if(WebP_FOUND) - set(WrapWebP_FOUND ON) +if(WrapWebP_FOUND) + set(WebP_FOUND ON) add_library(WrapWebP::WrapWebP INTERFACE IMPORTED) target_link_libraries(WrapWebP::WrapWebP INTERFACE ${WebP_LIBRARY} ${WebP_demux_LIBRARY} ${WebP_mux_LIBRARY}) target_include_directories(WrapWebP::WrapWebP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.1.0/conanfile.py new/qtimageformats-everywhere-src-6.1.1/conanfile.py --- old/qtimageformats-everywhere-src-6.1.0/conanfile.py 2021-05-03 11:49:13.000000000 +0200 +++ new/qtimageformats-everywhere-src-6.1.1/conanfile.py 2021-06-02 06:27:46.000000000 +0200 @@ -28,6 +28,7 @@ from conans import ConanFile, tools, CMake import os +from pathlib import Path class QtConanError(Exception): @@ -36,7 +37,7 @@ class QtImageFormats(ConanFile): name = "qtimageformats" - version = "6.1.0" + version = "6.1.1" license = "LGPL-3.0+, GPL-2.0+, Commercial Qt License Agreement" author = "The Qt Company <https://www.qt.io/contact-us>" url = "https://code.qt.io/cgit/qt/qtimageformats.git" @@ -48,7 +49,8 @@ default_options = {"shared": False, "qt6": None} exports_sources = "*", "!conan*.*" - revision_mode = "scm" # use commit ID as the RREV (recipe revision) + # use commit ID as the RREV (recipe revision) if this is exported from .git repository + revision_mode = "scm" if Path(Path(__file__).parent.resolve() / ".git").exists() else "hash" def source(self): # sources are installed next to recipe, no need to clone etc. sources here diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.1.0/dependencies.yaml new/qtimageformats-everywhere-src-6.1.1/dependencies.yaml --- old/qtimageformats-everywhere-src-6.1.0/dependencies.yaml 2021-05-03 11:49:13.000000000 +0200 +++ new/qtimageformats-everywhere-src-6.1.1/dependencies.yaml 2021-06-02 06:27:46.000000000 +0200 @@ -1,4 +1,4 @@ dependencies: ../qtbase: - ref: b2ebc64dd9914359fe8acf2bc9960e341e98cf80 + ref: 179b3f6797094a494e13a4d3daa5c6732bf0ada2 required: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/tiff/CMakeLists.txt new/qtimageformats-everywhere-src-6.1.1/src/plugins/imageformats/tiff/CMakeLists.txt --- old/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/tiff/CMakeLists.txt 2021-05-03 11:49:13.000000000 +0200 +++ new/qtimageformats-everywhere-src-6.1.1/src/plugins/imageformats/tiff/CMakeLists.txt 2021-06-02 06:27:46.000000000 +0200 @@ -8,8 +8,8 @@ # Handle the conditional finding of either system zlib or qt zlib. if(NOT QT_FEATURE_system_zlib) find_package(Qt6 COMPONENTS Zlib) -elseif(NOT TARGET ZLIB::ZLIB) - qt_find_package(ZLIB PROVIDED_TARGETS ZLIB::ZLIB) +elseif(NOT TARGET WrapZLIB::WrapZLIB) + qt_find_package(WrapZLIB PROVIDED_TARGETS WrapZLIB::WrapZLIB) endif() # special case end @@ -93,7 +93,7 @@ qt_internal_extend_target(QTiffPlugin CONDITION QT_FEATURE_system_zlib AND NOT QT_FEATURE_system_tiff LIBRARIES - ZLIB::ZLIB + WrapZLIB::WrapZLIB ) qt_internal_extend_target(QTiffPlugin CONDITION NOT QT_FEATURE_system_tiff AND NOT QT_FEATURE_system_zlib diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.1.0/tests/auto/dds/CMakeLists.txt new/qtimageformats-everywhere-src-6.1.1/tests/auto/dds/CMakeLists.txt --- old/qtimageformats-everywhere-src-6.1.0/tests/auto/dds/CMakeLists.txt 2021-05-03 11:49:13.000000000 +0200 +++ new/qtimageformats-everywhere-src-6.1.1/tests/auto/dds/CMakeLists.txt 2021-06-02 06:27:46.000000000 +0200 @@ -12,207 +12,57 @@ ) # Resources: -set_source_files_properties("../../shared/images/dds/A16B16G16R16.dds" - PROPERTIES QT_RESOURCE_ALIAS "dds/A16B16G16R16.dds" -) -set_source_files_properties("../../shared/images/dds/A16B16G16R16F.dds" - PROPERTIES QT_RESOURCE_ALIAS "dds/A16B16G16R16F.dds" -) -set_source_files_properties("../../shared/images/dds/A1R5G5B5.dds" - PROPERTIES QT_RESOURCE_ALIAS "dds/A1R5G5B5.dds" -) -set_source_files_properties("../../shared/images/dds/A2B10G10R10.dds" - PROPERTIES QT_RESOURCE_ALIAS "dds/A2B10G10R10.dds" -) -set_source_files_properties("../../shared/images/dds/A2R10G10B10.dds" - PROPERTIES QT_RESOURCE_ALIAS "dds/A2R10G10B10.dds" -) -set_source_files_properties("../../shared/images/dds/A2W10V10U10.dds" - PROPERTIES QT_RESOURCE_ALIAS "dds/A2W10V10U10.dds" -) -set_source_files_properties("../../shared/images/dds/A32B32G32R32F.dds" - PROPERTIES QT_RESOURCE_ALIAS "dds/A32B32G32R32F.dds" -) -set_source_files_properties("../../shared/images/dds/A4L4.dds" - PROPERTIES QT_RESOURCE_ALIAS "dds/A4L4.dds" -) -set_source_files_properties("../../shared/images/dds/A4R4G4B4.dds" - PROPERTIES QT_RESOURCE_ALIAS "dds/A4R4G4B4.dds" -) -set_source_files_properties("../../shared/images/dds/A8.dds" - PROPERTIES QT_RESOURCE_ALIAS "dds/A8.dds" -) -set_source_files_properties("../../shared/images/dds/A8B8G8R8.dds" - PROPERTIES QT_RESOURCE_ALIAS "dds/A8B8G8R8.dds" -) -set_source_files_properties("../../shared/images/dds/A8L8.dds" - PROPERTIES QT_RESOURCE_ALIAS "dds/A8L8.dds" -) -set_source_files_properties("../../shared/images/dds/A8R3G3B2.dds" - PROPERTIES QT_RESOURCE_ALIAS "dds/A8R3G3B2.dds" -) -set_source_files_properties("../../shared/images/dds/A8R8G8B8.2.dds" - PROPERTIES QT_RESOURCE_ALIAS "dds/A8R8G8B8.2.dds" -) -set_source_files_properties("../../shared/images/dds/A8R8G8B8.dds" - PROPERTIES QT_RESOURCE_ALIAS "dds/A8R8G8B8.dds" -) -set_source_files_properties("../../shared/images/dds/ATI2.dds" - PROPERTIES QT_RESOURCE_ALIAS "dds/ATI2.dds" -) -set_source_files_properties("../../shared/images/dds/CxV8U8.dds" - PROPERTIES QT_RESOURCE_ALIAS "dds/CxV8U8.dds" -) -set_source_files_properties("../../shared/images/dds/DXT1.dds" - PROPERTIES QT_RESOURCE_ALIAS "dds/DXT1.dds" -) -set_source_files_properties("../../shared/images/dds/DXT2.dds" - PROPERTIES QT_RESOURCE_ALIAS "dds/DXT2.dds" -) -set_source_files_properties("../../shared/images/dds/DXT3.dds" - PROPERTIES QT_RESOURCE_ALIAS "dds/DXT3.dds" -) -set_source_files_properties("../../shared/images/dds/DXT4.dds" - PROPERTIES QT_RESOURCE_ALIAS "dds/DXT4.dds" -) -set_source_files_properties("../../shared/images/dds/DXT5.dds" - PROPERTIES QT_RESOURCE_ALIAS "dds/DXT5.dds" -) -set_source_files_properties("../../shared/images/dds/G16R16.dds" - PROPERTIES QT_RESOURCE_ALIAS "dds/G16R16.dds" -) -set_source_files_properties("../../shared/images/dds/G16R16F.dds" - PROPERTIES QT_RESOURCE_ALIAS "dds/G16R16F.dds" -) -set_source_files_properties("../../shared/images/dds/G32R32F.dds" - PROPERTIES QT_RESOURCE_ALIAS "dds/G32R32F.dds" -) -set_source_files_properties("../../shared/images/dds/G8R8_G8B8.dds" - PROPERTIES QT_RESOURCE_ALIAS "dds/G8R8_G8B8.dds" -) -set_source_files_properties("../../shared/images/dds/L16.dds" - PROPERTIES QT_RESOURCE_ALIAS "dds/L16.dds" -) -set_source_files_properties("../../shared/images/dds/L6V5U5.dds" - PROPERTIES QT_RESOURCE_ALIAS "dds/L6V5U5.dds" -) -set_source_files_properties("../../shared/images/dds/L8.dds" - PROPERTIES QT_RESOURCE_ALIAS "dds/L8.dds" -) -set_source_files_properties("../../shared/images/dds/P4.dds" - PROPERTIES QT_RESOURCE_ALIAS "dds/P4.dds" -) -set_source_files_properties("../../shared/images/dds/P8.dds" - PROPERTIES QT_RESOURCE_ALIAS "dds/P8.dds" -) -set_source_files_properties("../../shared/images/dds/Q16W16V16U16.dds" - PROPERTIES QT_RESOURCE_ALIAS "dds/Q16W16V16U16.dds" -) -set_source_files_properties("../../shared/images/dds/Q8W8V8U8.dds" - PROPERTIES QT_RESOURCE_ALIAS "dds/Q8W8V8U8.dds" -) -set_source_files_properties("../../shared/images/dds/R16F.dds" - PROPERTIES QT_RESOURCE_ALIAS "dds/R16F.dds" -) -set_source_files_properties("../../shared/images/dds/R32F.dds" - PROPERTIES QT_RESOURCE_ALIAS "dds/R32F.dds" -) -set_source_files_properties("../../shared/images/dds/R3G3B2.dds" - PROPERTIES QT_RESOURCE_ALIAS "dds/R3G3B2.dds" -) -set_source_files_properties("../../shared/images/dds/R5G6B5.dds" - PROPERTIES QT_RESOURCE_ALIAS "dds/R5G6B5.dds" -) -set_source_files_properties("../../shared/images/dds/R8G8B8.dds" - PROPERTIES QT_RESOURCE_ALIAS "dds/R8G8B8.dds" -) -set_source_files_properties("../../shared/images/dds/R8G8_B8G8.dds" - PROPERTIES QT_RESOURCE_ALIAS "dds/R8G8_B8G8.dds" -) -set_source_files_properties("../../shared/images/dds/RXGB.dds" - PROPERTIES QT_RESOURCE_ALIAS "dds/RXGB.dds" -) -set_source_files_properties("../../shared/images/dds/UYVY.dds" - PROPERTIES QT_RESOURCE_ALIAS "dds/UYVY.dds" -) -set_source_files_properties("../../shared/images/dds/V16U16.dds" - PROPERTIES QT_RESOURCE_ALIAS "dds/V16U16.dds" -) -set_source_files_properties("../../shared/images/dds/V8U8.dds" - PROPERTIES QT_RESOURCE_ALIAS "dds/V8U8.dds" -) -set_source_files_properties("../../shared/images/dds/X1R5G5B5.dds" - PROPERTIES QT_RESOURCE_ALIAS "dds/X1R5G5B5.dds" -) -set_source_files_properties("../../shared/images/dds/X4R4G4B4.dds" - PROPERTIES QT_RESOURCE_ALIAS "dds/X4R4G4B4.dds" -) -set_source_files_properties("../../shared/images/dds/X8B8G8R8.dds" - PROPERTIES QT_RESOURCE_ALIAS "dds/X8B8G8R8.dds" -) -set_source_files_properties("../../shared/images/dds/X8L8V8U8.dds" - PROPERTIES QT_RESOURCE_ALIAS "dds/X8L8V8U8.dds" -) -set_source_files_properties("../../shared/images/dds/X8R8G8B8.dds" - PROPERTIES QT_RESOURCE_ALIAS "dds/X8R8G8B8.dds" -) -set_source_files_properties("../../shared/images/dds/YUY2.dds" - PROPERTIES QT_RESOURCE_ALIAS "dds/YUY2.dds" -) -set_source_files_properties("../../shared/images/dds/mipmaps.dds" - PROPERTIES QT_RESOURCE_ALIAS "dds/mipmaps.dds" -) set(dds_resource_files - "dds/A16B16G16R16.dds" - "dds/A16B16G16R16F.dds" - "dds/A1R5G5B5.dds" - "dds/A2B10G10R10.dds" - "dds/A2R10G10B10.dds" - "dds/A2W10V10U10.dds" - "dds/A32B32G32R32F.dds" - "dds/A4L4.dds" - "dds/A4R4G4B4.dds" - "dds/A8.dds" - "dds/A8B8G8R8.dds" - "dds/A8L8.dds" - "dds/A8R3G3B2.dds" - "dds/A8R8G8B8.2.dds" - "dds/A8R8G8B8.dds" - "dds/ATI2.dds" - "dds/CxV8U8.dds" - "dds/DXT1.dds" - "dds/DXT2.dds" - "dds/DXT3.dds" - "dds/DXT4.dds" - "dds/DXT5.dds" - "dds/G16R16.dds" - "dds/G16R16F.dds" - "dds/G32R32F.dds" - "dds/G8R8_G8B8.dds" - "dds/L16.dds" - "dds/L6V5U5.dds" - "dds/L8.dds" - "dds/P4.dds" - "dds/P8.dds" - "dds/Q16W16V16U16.dds" - "dds/Q8W8V8U8.dds" - "dds/R16F.dds" - "dds/R32F.dds" - "dds/R3G3B2.dds" - "dds/R5G6B5.dds" - "dds/R8G8B8.dds" - "dds/R8G8_B8G8.dds" - "dds/RXGB.dds" - "dds/UYVY.dds" - "dds/V16U16.dds" - "dds/V8U8.dds" - "dds/X1R5G5B5.dds" - "dds/X4R4G4B4.dds" - "dds/X8B8G8R8.dds" - "dds/X8L8V8U8.dds" - "dds/X8R8G8B8.dds" - "dds/YUY2.dds" - "dds/mipmaps.dds" + "../../shared/images/dds/A16B16G16R16.dds" + "../../shared/images/dds/A16B16G16R16F.dds" + "../../shared/images/dds/A1R5G5B5.dds" + "../../shared/images/dds/A2B10G10R10.dds" + "../../shared/images/dds/A2R10G10B10.dds" + "../../shared/images/dds/A2W10V10U10.dds" + "../../shared/images/dds/A32B32G32R32F.dds" + "../../shared/images/dds/A4L4.dds" + "../../shared/images/dds/A4R4G4B4.dds" + "../../shared/images/dds/A8.dds" + "../../shared/images/dds/A8B8G8R8.dds" + "../../shared/images/dds/A8L8.dds" + "../../shared/images/dds/A8R3G3B2.dds" + "../../shared/images/dds/A8R8G8B8.2.dds" + "../../shared/images/dds/A8R8G8B8.dds" + "../../shared/images/dds/ATI2.dds" + "../../shared/images/dds/CxV8U8.dds" + "../../shared/images/dds/DXT1.dds" + "../../shared/images/dds/DXT2.dds" + "../../shared/images/dds/DXT3.dds" + "../../shared/images/dds/DXT4.dds" + "../../shared/images/dds/DXT5.dds" + "../../shared/images/dds/G16R16.dds" + "../../shared/images/dds/G16R16F.dds" + "../../shared/images/dds/G32R32F.dds" + "../../shared/images/dds/G8R8_G8B8.dds" + "../../shared/images/dds/L16.dds" + "../../shared/images/dds/L6V5U5.dds" + "../../shared/images/dds/L8.dds" + "../../shared/images/dds/P4.dds" + "../../shared/images/dds/P8.dds" + "../../shared/images/dds/Q16W16V16U16.dds" + "../../shared/images/dds/Q8W8V8U8.dds" + "../../shared/images/dds/R16F.dds" + "../../shared/images/dds/R32F.dds" + "../../shared/images/dds/R3G3B2.dds" + "../../shared/images/dds/R5G6B5.dds" + "../../shared/images/dds/R8G8B8.dds" + "../../shared/images/dds/R8G8_B8G8.dds" + "../../shared/images/dds/RXGB.dds" + "../../shared/images/dds/UYVY.dds" + "../../shared/images/dds/V16U16.dds" + "../../shared/images/dds/V8U8.dds" + "../../shared/images/dds/X1R5G5B5.dds" + "../../shared/images/dds/X4R4G4B4.dds" + "../../shared/images/dds/X8B8G8R8.dds" + "../../shared/images/dds/X8L8V8U8.dds" + "../../shared/images/dds/X8R8G8B8.dds" + "../../shared/images/dds/YUY2.dds" + "../../shared/images/dds/mipmaps.dds" ) qt_internal_add_resource(tst_qdds "dds" @@ -223,4 +73,3 @@ FILES ${dds_resource_files} ) - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.1.0/tests/auto/heif/CMakeLists.txt new/qtimageformats-everywhere-src-6.1.1/tests/auto/heif/CMakeLists.txt --- old/qtimageformats-everywhere-src-6.1.0/tests/auto/heif/CMakeLists.txt 2021-05-03 11:49:13.000000000 +0200 +++ new/qtimageformats-everywhere-src-6.1.1/tests/auto/heif/CMakeLists.txt 2021-06-02 06:27:46.000000000 +0200 @@ -12,15 +12,9 @@ ) # Resources: -set_source_files_properties("../../shared/images/heif/col320x480.heic" - PROPERTIES QT_RESOURCE_ALIAS "heif/col320x480.heic" -) -set_source_files_properties("../../shared/images/heif/newlogoCCW.heic" - PROPERTIES QT_RESOURCE_ALIAS "heif/newlogoCCW.heic" -) set(heif_resource_files - "heif/col320x480.heic" - "heif/newlogoCCW.heic" + "../../shared/images/heif/col320x480.heic" + "../../shared/images/heif/newlogoCCW.heic" ) qt_internal_add_resource(tst_qheif "heif" @@ -31,4 +25,3 @@ FILES ${heif_resource_files} ) - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.1.0/tests/auto/icns/CMakeLists.txt new/qtimageformats-everywhere-src-6.1.1/tests/auto/icns/CMakeLists.txt --- old/qtimageformats-everywhere-src-6.1.0/tests/auto/icns/CMakeLists.txt 2021-05-03 11:49:13.000000000 +0200 +++ new/qtimageformats-everywhere-src-6.1.1/tests/auto/icns/CMakeLists.txt 2021-06-02 06:27:46.000000000 +0200 @@ -12,55 +12,19 @@ ) # Resources: -set_source_files_properties("../../shared/images/icns/test-32bit.icns" - PROPERTIES QT_RESOURCE_ALIAS "icns/test-32bit.icns" -) -set_source_files_properties("../../shared/images/icns/test-jp2.icns" - PROPERTIES QT_RESOURCE_ALIAS "icns/test-jp2.icns" -) -set_source_files_properties("../../shared/images/icns/test-legacy.icns" - PROPERTIES QT_RESOURCE_ALIAS "icns/test-legacy.icns" -) -set_source_files_properties("../../shared/images/icns/test-png.icns" - PROPERTIES QT_RESOURCE_ALIAS "icns/test-png.icns" -) -set_source_files_properties("../../shared/images/icns/test-variants.icns" - PROPERTIES QT_RESOURCE_ALIAS "icns/test-variants.icns" -) -set_source_files_properties("../../shared/images/icns/test-write-1024.png" - PROPERTIES QT_RESOURCE_ALIAS "icns/test-write-1024.png" -) -set_source_files_properties("../../shared/images/icns/test-write-128.png" - PROPERTIES QT_RESOURCE_ALIAS "icns/test-write-128.png" -) -set_source_files_properties("../../shared/images/icns/test-write-16.png" - PROPERTIES QT_RESOURCE_ALIAS "icns/test-write-16.png" -) -set_source_files_properties("../../shared/images/icns/test-write-256.png" - PROPERTIES QT_RESOURCE_ALIAS "icns/test-write-256.png" -) -set_source_files_properties("../../shared/images/icns/test-write-32.png" - PROPERTIES QT_RESOURCE_ALIAS "icns/test-write-32.png" -) -set_source_files_properties("../../shared/images/icns/test-write-512.png" - PROPERTIES QT_RESOURCE_ALIAS "icns/test-write-512.png" -) -set_source_files_properties("../../shared/images/icns/test-write-64.png" - PROPERTIES QT_RESOURCE_ALIAS "icns/test-write-64.png" -) set(icns_resource_files - "icns/test-32bit.icns" - "icns/test-jp2.icns" - "icns/test-legacy.icns" - "icns/test-png.icns" - "icns/test-variants.icns" - "icns/test-write-1024.png" - "icns/test-write-128.png" - "icns/test-write-16.png" - "icns/test-write-256.png" - "icns/test-write-32.png" - "icns/test-write-512.png" - "icns/test-write-64.png" + "../../shared/images/icns/test-32bit.icns" + "../../shared/images/icns/test-jp2.icns" + "../../shared/images/icns/test-legacy.icns" + "../../shared/images/icns/test-png.icns" + "../../shared/images/icns/test-variants.icns" + "../../shared/images/icns/test-write-1024.png" + "../../shared/images/icns/test-write-128.png" + "../../shared/images/icns/test-write-16.png" + "../../shared/images/icns/test-write-256.png" + "../../shared/images/icns/test-write-32.png" + "../../shared/images/icns/test-write-512.png" + "../../shared/images/icns/test-write-64.png" ) qt_internal_add_resource(tst_qicns "icns" @@ -71,4 +35,3 @@ FILES ${icns_resource_files} ) - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.1.0/tests/auto/jp2/CMakeLists.txt new/qtimageformats-everywhere-src-6.1.1/tests/auto/jp2/CMakeLists.txt --- old/qtimageformats-everywhere-src-6.1.0/tests/auto/jp2/CMakeLists.txt 2021-05-03 11:49:13.000000000 +0200 +++ new/qtimageformats-everywhere-src-6.1.1/tests/auto/jp2/CMakeLists.txt 2021-06-02 06:27:46.000000000 +0200 @@ -12,15 +12,9 @@ ) # Resources: -set_source_files_properties("../../shared/images/jp2/logo.bmp" - PROPERTIES QT_RESOURCE_ALIAS "jp2/logo.bmp" -) -set_source_files_properties("../../shared/images/jp2/logo.jp2" - PROPERTIES QT_RESOURCE_ALIAS "jp2/logo.jp2" -) set(jp2_resource_files - "jp2/logo.bmp" - "jp2/logo.jp2" + "../../shared/images/jp2/logo.bmp" + "../../shared/images/jp2/logo.jp2" ) qt_internal_add_resource(tst_qjp2 "jp2" @@ -31,4 +25,3 @@ FILES ${jp2_resource_files} ) - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.1.0/tests/auto/mng/CMakeLists.txt new/qtimageformats-everywhere-src-6.1.1/tests/auto/mng/CMakeLists.txt --- old/qtimageformats-everywhere-src-6.1.0/tests/auto/mng/CMakeLists.txt 2021-05-03 11:49:13.000000000 +0200 +++ new/qtimageformats-everywhere-src-6.1.1/tests/auto/mng/CMakeLists.txt 2021-06-02 06:27:46.000000000 +0200 @@ -12,27 +12,12 @@ ) # Resources: -set_source_files_properties("../../shared/images/mng/animation.mng" - PROPERTIES QT_RESOURCE_ALIAS "mng/animation.mng" -) -set_source_files_properties("../../shared/images/mng/ball.mng" - PROPERTIES QT_RESOURCE_ALIAS "mng/ball.mng" -) -set_source_files_properties("../../shared/images/mng/corrupt.mng" - PROPERTIES QT_RESOURCE_ALIAS "mng/corrupt.mng" -) -set_source_files_properties("../../shared/images/mng/dutch.mng" - PROPERTIES QT_RESOURCE_ALIAS "mng/dutch.mng" -) -set_source_files_properties("../../shared/images/mng/fire.mng" - PROPERTIES QT_RESOURCE_ALIAS "mng/fire.mng" -) set(mng_resource_files - "mng/animation.mng" - "mng/ball.mng" - "mng/corrupt.mng" - "mng/dutch.mng" - "mng/fire.mng" + "../../shared/images/mng/animation.mng" + "../../shared/images/mng/ball.mng" + "../../shared/images/mng/corrupt.mng" + "../../shared/images/mng/dutch.mng" + "../../shared/images/mng/fire.mng" ) qt_internal_add_resource(tst_qmng "mng" @@ -43,4 +28,3 @@ FILES ${mng_resource_files} ) - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.1.0/tests/auto/tga/CMakeLists.txt new/qtimageformats-everywhere-src-6.1.1/tests/auto/tga/CMakeLists.txt --- old/qtimageformats-everywhere-src-6.1.0/tests/auto/tga/CMakeLists.txt 2021-05-03 11:49:13.000000000 +0200 +++ new/qtimageformats-everywhere-src-6.1.1/tests/auto/tga/CMakeLists.txt 2021-06-02 06:27:46.000000000 +0200 @@ -12,11 +12,8 @@ ) # Resources: -set_source_files_properties("../../shared/images/tga/test-flag.tga" - PROPERTIES QT_RESOURCE_ALIAS "tga/test-flag.tga" -) set(tga_resource_files - "tga/test-flag.tga" + "../../shared/images/tga/test-flag.tga" ) qt_internal_add_resource(tst_qtga "tga" @@ -27,4 +24,3 @@ FILES ${tga_resource_files} ) - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.1.0/tests/auto/tiff/CMakeLists.txt new/qtimageformats-everywhere-src-6.1.1/tests/auto/tiff/CMakeLists.txt --- old/qtimageformats-everywhere-src-6.1.0/tests/auto/tiff/CMakeLists.txt 2021-05-03 11:49:13.000000000 +0200 +++ new/qtimageformats-everywhere-src-6.1.1/tests/auto/tiff/CMakeLists.txt 2021-06-02 06:27:46.000000000 +0200 @@ -12,231 +12,63 @@ ) # Resources: -set_source_files_properties("../../shared/images/tiff/16bpc.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/16bpc.tiff" -) -set_source_files_properties("../../shared/images/tiff/big_16bpc.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/big_16bpc.tiff" -) -set_source_files_properties("../../shared/images/tiff/big_grayscale.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/big_grayscale.tiff" -) -set_source_files_properties("../../shared/images/tiff/big_rgb.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/big_rgb.tiff" -) -set_source_files_properties("../../shared/images/tiff/big_rgb_bigendian.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/big_rgb_bigendian.tiff" -) -set_source_files_properties("../../shared/images/tiff/colorful.bmp" - PROPERTIES QT_RESOURCE_ALIAS "tiff/colorful.bmp" -) -set_source_files_properties("../../shared/images/tiff/corrupt-data.tif" - PROPERTIES QT_RESOURCE_ALIAS "tiff/corrupt-data.tif" -) -set_source_files_properties("../../shared/images/tiff/gray16.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/gray16.tiff" -) -set_source_files_properties("../../shared/images/tiff/grayscale-ref.tif" - PROPERTIES QT_RESOURCE_ALIAS "tiff/grayscale-ref.tif" -) -set_source_files_properties("../../shared/images/tiff/grayscale.tif" - PROPERTIES QT_RESOURCE_ALIAS "tiff/grayscale.tif" -) -set_source_files_properties("../../shared/images/tiff/image.tif" - PROPERTIES QT_RESOURCE_ALIAS "tiff/image.tif" -) -set_source_files_properties("../../shared/images/tiff/image_100dpi.tif" - PROPERTIES QT_RESOURCE_ALIAS "tiff/image_100dpi.tif" -) -set_source_files_properties("../../shared/images/tiff/indexed_orientation_1.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/indexed_orientation_1.tiff" -) -set_source_files_properties("../../shared/images/tiff/indexed_orientation_2.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/indexed_orientation_2.tiff" -) -set_source_files_properties("../../shared/images/tiff/indexed_orientation_3.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/indexed_orientation_3.tiff" -) -set_source_files_properties("../../shared/images/tiff/indexed_orientation_4.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/indexed_orientation_4.tiff" -) -set_source_files_properties("../../shared/images/tiff/indexed_orientation_5.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/indexed_orientation_5.tiff" -) -set_source_files_properties("../../shared/images/tiff/indexed_orientation_6.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/indexed_orientation_6.tiff" -) -set_source_files_properties("../../shared/images/tiff/indexed_orientation_7.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/indexed_orientation_7.tiff" -) -set_source_files_properties("../../shared/images/tiff/indexed_orientation_8.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/indexed_orientation_8.tiff" -) -set_source_files_properties("../../shared/images/tiff/mono_orientation_1.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/mono_orientation_1.tiff" -) -set_source_files_properties("../../shared/images/tiff/mono_orientation_2.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/mono_orientation_2.tiff" -) -set_source_files_properties("../../shared/images/tiff/mono_orientation_3.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/mono_orientation_3.tiff" -) -set_source_files_properties("../../shared/images/tiff/mono_orientation_4.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/mono_orientation_4.tiff" -) -set_source_files_properties("../../shared/images/tiff/mono_orientation_5.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/mono_orientation_5.tiff" -) -set_source_files_properties("../../shared/images/tiff/mono_orientation_6.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/mono_orientation_6.tiff" -) -set_source_files_properties("../../shared/images/tiff/mono_orientation_7.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/mono_orientation_7.tiff" -) -set_source_files_properties("../../shared/images/tiff/mono_orientation_8.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/mono_orientation_8.tiff" -) -set_source_files_properties("../../shared/images/tiff/multipage.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/multipage.tiff" -) -set_source_files_properties("../../shared/images/tiff/oddsize_grayscale.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/oddsize_grayscale.tiff" -) -set_source_files_properties("../../shared/images/tiff/oddsize_mono.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/oddsize_mono.tiff" -) -set_source_files_properties("../../shared/images/tiff/original_grayscale.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/original_grayscale.tiff" -) -set_source_files_properties("../../shared/images/tiff/original_indexed.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/original_indexed.tiff" -) -set_source_files_properties("../../shared/images/tiff/original_mono.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/original_mono.tiff" -) -set_source_files_properties("../../shared/images/tiff/original_rgb.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/original_rgb.tiff" -) -set_source_files_properties("../../shared/images/tiff/rgb_orientation_1.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/rgb_orientation_1.tiff" -) -set_source_files_properties("../../shared/images/tiff/rgb_orientation_2.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/rgb_orientation_2.tiff" -) -set_source_files_properties("../../shared/images/tiff/rgb_orientation_3.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/rgb_orientation_3.tiff" -) -set_source_files_properties("../../shared/images/tiff/rgb_orientation_4.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/rgb_orientation_4.tiff" -) -set_source_files_properties("../../shared/images/tiff/rgb_orientation_5.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/rgb_orientation_5.tiff" -) -set_source_files_properties("../../shared/images/tiff/rgb_orientation_6.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/rgb_orientation_6.tiff" -) -set_source_files_properties("../../shared/images/tiff/rgb_orientation_7.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/rgb_orientation_7.tiff" -) -set_source_files_properties("../../shared/images/tiff/rgb_orientation_8.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/rgb_orientation_8.tiff" -) -set_source_files_properties("../../shared/images/tiff/rgba_adobedeflate_littleendian.tif" - PROPERTIES QT_RESOURCE_ALIAS "tiff/rgba_adobedeflate_littleendian.tif" -) -set_source_files_properties("../../shared/images/tiff/rgba_lzw_littleendian.tif" - PROPERTIES QT_RESOURCE_ALIAS "tiff/rgba_lzw_littleendian.tif" -) -set_source_files_properties("../../shared/images/tiff/rgba_nocompression_bigendian.tif" - PROPERTIES QT_RESOURCE_ALIAS "tiff/rgba_nocompression_bigendian.tif" -) -set_source_files_properties("../../shared/images/tiff/rgba_nocompression_littleendian.tif" - PROPERTIES QT_RESOURCE_ALIAS "tiff/rgba_nocompression_littleendian.tif" -) -set_source_files_properties("../../shared/images/tiff/rgba_packbits_littleendian.tif" - PROPERTIES QT_RESOURCE_ALIAS "tiff/rgba_packbits_littleendian.tif" -) -set_source_files_properties("../../shared/images/tiff/rgba_zipdeflate_littleendian.tif" - PROPERTIES QT_RESOURCE_ALIAS "tiff/rgba_zipdeflate_littleendian.tif" -) -set_source_files_properties("../../shared/images/tiff/teapot.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/teapot.tiff" -) -set_source_files_properties("../../shared/images/tiff/tiled_grayscale.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/tiled_grayscale.tiff" -) -set_source_files_properties("../../shared/images/tiff/tiled_indexed.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/tiled_indexed.tiff" -) -set_source_files_properties("../../shared/images/tiff/tiled_mono.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/tiled_mono.tiff" -) -set_source_files_properties("../../shared/images/tiff/tiled_oddsize_grayscale.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/tiled_oddsize_grayscale.tiff" -) -set_source_files_properties("../../shared/images/tiff/tiled_oddsize_mono.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/tiled_oddsize_mono.tiff" -) -set_source_files_properties("../../shared/images/tiff/tiled_rgb.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/tiled_rgb.tiff" -) set(tiff_resource_files - "tiff/16bpc.tiff" - "tiff/big_16bpc.tiff" - "tiff/big_grayscale.tiff" - "tiff/big_rgb.tiff" - "tiff/big_rgb_bigendian.tiff" - "tiff/colorful.bmp" - "tiff/corrupt-data.tif" - "tiff/gray16.tiff" - "tiff/grayscale-ref.tif" - "tiff/grayscale.tif" - "tiff/image.tif" - "tiff/image_100dpi.tif" - "tiff/indexed_orientation_1.tiff" - "tiff/indexed_orientation_2.tiff" - "tiff/indexed_orientation_3.tiff" - "tiff/indexed_orientation_4.tiff" - "tiff/indexed_orientation_5.tiff" - "tiff/indexed_orientation_6.tiff" - "tiff/indexed_orientation_7.tiff" - "tiff/indexed_orientation_8.tiff" - "tiff/mono_orientation_1.tiff" - "tiff/mono_orientation_2.tiff" - "tiff/mono_orientation_3.tiff" - "tiff/mono_orientation_4.tiff" - "tiff/mono_orientation_5.tiff" - "tiff/mono_orientation_6.tiff" - "tiff/mono_orientation_7.tiff" - "tiff/mono_orientation_8.tiff" - "tiff/multipage.tiff" - "tiff/oddsize_grayscale.tiff" - "tiff/oddsize_mono.tiff" - "tiff/original_grayscale.tiff" - "tiff/original_indexed.tiff" - "tiff/original_mono.tiff" - "tiff/original_rgb.tiff" - "tiff/rgb_orientation_1.tiff" - "tiff/rgb_orientation_2.tiff" - "tiff/rgb_orientation_3.tiff" - "tiff/rgb_orientation_4.tiff" - "tiff/rgb_orientation_5.tiff" - "tiff/rgb_orientation_6.tiff" - "tiff/rgb_orientation_7.tiff" - "tiff/rgb_orientation_8.tiff" - "tiff/rgba_adobedeflate_littleendian.tif" - "tiff/rgba_lzw_littleendian.tif" - "tiff/rgba_nocompression_bigendian.tif" - "tiff/rgba_nocompression_littleendian.tif" - "tiff/rgba_packbits_littleendian.tif" - "tiff/rgba_zipdeflate_littleendian.tif" - "tiff/teapot.tiff" - "tiff/tiled_grayscale.tiff" - "tiff/tiled_indexed.tiff" - "tiff/tiled_mono.tiff" - "tiff/tiled_oddsize_grayscale.tiff" - "tiff/tiled_oddsize_mono.tiff" - "tiff/tiled_rgb.tiff" + "../../shared/images/tiff/16bpc.tiff" + "../../shared/images/tiff/big_16bpc.tiff" + "../../shared/images/tiff/big_grayscale.tiff" + "../../shared/images/tiff/big_rgb.tiff" + "../../shared/images/tiff/big_rgb_bigendian.tiff" + "../../shared/images/tiff/colorful.bmp" + "../../shared/images/tiff/corrupt-data.tif" + "../../shared/images/tiff/gray16.tiff" + "../../shared/images/tiff/grayscale-ref.tif" + "../../shared/images/tiff/grayscale.tif" + "../../shared/images/tiff/image.tif" + "../../shared/images/tiff/image_100dpi.tif" + "../../shared/images/tiff/indexed_orientation_1.tiff" + "../../shared/images/tiff/indexed_orientation_2.tiff" + "../../shared/images/tiff/indexed_orientation_3.tiff" + "../../shared/images/tiff/indexed_orientation_4.tiff" + "../../shared/images/tiff/indexed_orientation_5.tiff" + "../../shared/images/tiff/indexed_orientation_6.tiff" + "../../shared/images/tiff/indexed_orientation_7.tiff" + "../../shared/images/tiff/indexed_orientation_8.tiff" + "../../shared/images/tiff/mono_orientation_1.tiff" + "../../shared/images/tiff/mono_orientation_2.tiff" + "../../shared/images/tiff/mono_orientation_3.tiff" + "../../shared/images/tiff/mono_orientation_4.tiff" + "../../shared/images/tiff/mono_orientation_5.tiff" + "../../shared/images/tiff/mono_orientation_6.tiff" + "../../shared/images/tiff/mono_orientation_7.tiff" + "../../shared/images/tiff/mono_orientation_8.tiff" + "../../shared/images/tiff/multipage.tiff" + "../../shared/images/tiff/oddsize_grayscale.tiff" + "../../shared/images/tiff/oddsize_mono.tiff" + "../../shared/images/tiff/original_grayscale.tiff" + "../../shared/images/tiff/original_indexed.tiff" + "../../shared/images/tiff/original_mono.tiff" + "../../shared/images/tiff/original_rgb.tiff" + "../../shared/images/tiff/rgb_orientation_1.tiff" + "../../shared/images/tiff/rgb_orientation_2.tiff" + "../../shared/images/tiff/rgb_orientation_3.tiff" + "../../shared/images/tiff/rgb_orientation_4.tiff" + "../../shared/images/tiff/rgb_orientation_5.tiff" + "../../shared/images/tiff/rgb_orientation_6.tiff" + "../../shared/images/tiff/rgb_orientation_7.tiff" + "../../shared/images/tiff/rgb_orientation_8.tiff" + "../../shared/images/tiff/rgba_adobedeflate_littleendian.tif" + "../../shared/images/tiff/rgba_lzw_littleendian.tif" + "../../shared/images/tiff/rgba_nocompression_bigendian.tif" + "../../shared/images/tiff/rgba_nocompression_littleendian.tif" + "../../shared/images/tiff/rgba_packbits_littleendian.tif" + "../../shared/images/tiff/rgba_zipdeflate_littleendian.tif" + "../../shared/images/tiff/teapot.tiff" + "../../shared/images/tiff/tiled_grayscale.tiff" + "../../shared/images/tiff/tiled_indexed.tiff" + "../../shared/images/tiff/tiled_mono.tiff" + "../../shared/images/tiff/tiled_oddsize_grayscale.tiff" + "../../shared/images/tiff/tiled_oddsize_mono.tiff" + "../../shared/images/tiff/tiled_rgb.tiff" ) qt_internal_add_resource(tst_qtiff "tiff" @@ -247,4 +79,3 @@ FILES ${tiff_resource_files} ) - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.1.0/tests/auto/wbmp/CMakeLists.txt new/qtimageformats-everywhere-src-6.1.1/tests/auto/wbmp/CMakeLists.txt --- old/qtimageformats-everywhere-src-6.1.0/tests/auto/wbmp/CMakeLists.txt 2021-05-03 11:49:13.000000000 +0200 +++ new/qtimageformats-everywhere-src-6.1.1/tests/auto/wbmp/CMakeLists.txt 2021-06-02 06:27:46.000000000 +0200 @@ -12,15 +12,9 @@ ) # Resources: -set_source_files_properties("../../shared/images/wbmp/qt-logo-big.wbmp" - PROPERTIES QT_RESOURCE_ALIAS "wbmp/qt-logo-big.wbmp" -) -set_source_files_properties("../../shared/images/wbmp/qt-logo-small.wbmp" - PROPERTIES QT_RESOURCE_ALIAS "wbmp/qt-logo-small.wbmp" -) set(wbmp_resource_files - "wbmp/qt-logo-big.wbmp" - "wbmp/qt-logo-small.wbmp" + "../../shared/images/wbmp/qt-logo-big.wbmp" + "../../shared/images/wbmp/qt-logo-small.wbmp" ) qt_internal_add_resource(tst_qwbmp "wbmp" @@ -31,4 +25,3 @@ FILES ${wbmp_resource_files} ) - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.1.0/tests/benchmarks/mng/CMakeLists.txt new/qtimageformats-everywhere-src-6.1.1/tests/benchmarks/mng/CMakeLists.txt --- old/qtimageformats-everywhere-src-6.1.0/tests/benchmarks/mng/CMakeLists.txt 2021-05-03 11:49:13.000000000 +0200 +++ new/qtimageformats-everywhere-src-6.1.1/tests/benchmarks/mng/CMakeLists.txt 2021-06-02 06:27:46.000000000 +0200 @@ -13,27 +13,12 @@ ) # Resources: -set_source_files_properties("../../shared/images/mng/animation.mng" - PROPERTIES QT_RESOURCE_ALIAS "mng/animation.mng" -) -set_source_files_properties("../../shared/images/mng/ball.mng" - PROPERTIES QT_RESOURCE_ALIAS "mng/ball.mng" -) -set_source_files_properties("../../shared/images/mng/corrupt.mng" - PROPERTIES QT_RESOURCE_ALIAS "mng/corrupt.mng" -) -set_source_files_properties("../../shared/images/mng/dutch.mng" - PROPERTIES QT_RESOURCE_ALIAS "mng/dutch.mng" -) -set_source_files_properties("../../shared/images/mng/fire.mng" - PROPERTIES QT_RESOURCE_ALIAS "mng/fire.mng" -) set(mng_resource_files - "mng/animation.mng" - "mng/ball.mng" - "mng/corrupt.mng" - "mng/dutch.mng" - "mng/fire.mng" + "../../shared/images/mng/animation.mng" + "../../shared/images/mng/ball.mng" + "../../shared/images/mng/corrupt.mng" + "../../shared/images/mng/dutch.mng" + "../../shared/images/mng/fire.mng" ) qt_internal_add_resource(tst_bench_qmng "mng" @@ -44,4 +29,3 @@ FILES ${mng_resource_files} ) - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.1.0/tests/benchmarks/tiff/CMakeLists.txt new/qtimageformats-everywhere-src-6.1.1/tests/benchmarks/tiff/CMakeLists.txt --- old/qtimageformats-everywhere-src-6.1.0/tests/benchmarks/tiff/CMakeLists.txt 2021-05-03 11:49:13.000000000 +0200 +++ new/qtimageformats-everywhere-src-6.1.1/tests/benchmarks/tiff/CMakeLists.txt 2021-06-02 06:27:46.000000000 +0200 @@ -13,231 +13,63 @@ ) # Resources: -set_source_files_properties("../../shared/images/tiff/16bpc.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/16bpc.tiff" -) -set_source_files_properties("../../shared/images/tiff/big_16bpc.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/big_16bpc.tiff" -) -set_source_files_properties("../../shared/images/tiff/big_grayscale.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/big_grayscale.tiff" -) -set_source_files_properties("../../shared/images/tiff/big_rgb.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/big_rgb.tiff" -) -set_source_files_properties("../../shared/images/tiff/big_rgb_bigendian.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/big_rgb_bigendian.tiff" -) -set_source_files_properties("../../shared/images/tiff/colorful.bmp" - PROPERTIES QT_RESOURCE_ALIAS "tiff/colorful.bmp" -) -set_source_files_properties("../../shared/images/tiff/corrupt-data.tif" - PROPERTIES QT_RESOURCE_ALIAS "tiff/corrupt-data.tif" -) -set_source_files_properties("../../shared/images/tiff/gray16.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/gray16.tiff" -) -set_source_files_properties("../../shared/images/tiff/grayscale-ref.tif" - PROPERTIES QT_RESOURCE_ALIAS "tiff/grayscale-ref.tif" -) -set_source_files_properties("../../shared/images/tiff/grayscale.tif" - PROPERTIES QT_RESOURCE_ALIAS "tiff/grayscale.tif" -) -set_source_files_properties("../../shared/images/tiff/image.tif" - PROPERTIES QT_RESOURCE_ALIAS "tiff/image.tif" -) -set_source_files_properties("../../shared/images/tiff/image_100dpi.tif" - PROPERTIES QT_RESOURCE_ALIAS "tiff/image_100dpi.tif" -) -set_source_files_properties("../../shared/images/tiff/indexed_orientation_1.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/indexed_orientation_1.tiff" -) -set_source_files_properties("../../shared/images/tiff/indexed_orientation_2.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/indexed_orientation_2.tiff" -) -set_source_files_properties("../../shared/images/tiff/indexed_orientation_3.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/indexed_orientation_3.tiff" -) -set_source_files_properties("../../shared/images/tiff/indexed_orientation_4.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/indexed_orientation_4.tiff" -) -set_source_files_properties("../../shared/images/tiff/indexed_orientation_5.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/indexed_orientation_5.tiff" -) -set_source_files_properties("../../shared/images/tiff/indexed_orientation_6.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/indexed_orientation_6.tiff" -) -set_source_files_properties("../../shared/images/tiff/indexed_orientation_7.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/indexed_orientation_7.tiff" -) -set_source_files_properties("../../shared/images/tiff/indexed_orientation_8.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/indexed_orientation_8.tiff" -) -set_source_files_properties("../../shared/images/tiff/mono_orientation_1.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/mono_orientation_1.tiff" -) -set_source_files_properties("../../shared/images/tiff/mono_orientation_2.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/mono_orientation_2.tiff" -) -set_source_files_properties("../../shared/images/tiff/mono_orientation_3.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/mono_orientation_3.tiff" -) -set_source_files_properties("../../shared/images/tiff/mono_orientation_4.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/mono_orientation_4.tiff" -) -set_source_files_properties("../../shared/images/tiff/mono_orientation_5.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/mono_orientation_5.tiff" -) -set_source_files_properties("../../shared/images/tiff/mono_orientation_6.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/mono_orientation_6.tiff" -) -set_source_files_properties("../../shared/images/tiff/mono_orientation_7.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/mono_orientation_7.tiff" -) -set_source_files_properties("../../shared/images/tiff/mono_orientation_8.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/mono_orientation_8.tiff" -) -set_source_files_properties("../../shared/images/tiff/multipage.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/multipage.tiff" -) -set_source_files_properties("../../shared/images/tiff/oddsize_grayscale.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/oddsize_grayscale.tiff" -) -set_source_files_properties("../../shared/images/tiff/oddsize_mono.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/oddsize_mono.tiff" -) -set_source_files_properties("../../shared/images/tiff/original_grayscale.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/original_grayscale.tiff" -) -set_source_files_properties("../../shared/images/tiff/original_indexed.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/original_indexed.tiff" -) -set_source_files_properties("../../shared/images/tiff/original_mono.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/original_mono.tiff" -) -set_source_files_properties("../../shared/images/tiff/original_rgb.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/original_rgb.tiff" -) -set_source_files_properties("../../shared/images/tiff/rgb_orientation_1.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/rgb_orientation_1.tiff" -) -set_source_files_properties("../../shared/images/tiff/rgb_orientation_2.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/rgb_orientation_2.tiff" -) -set_source_files_properties("../../shared/images/tiff/rgb_orientation_3.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/rgb_orientation_3.tiff" -) -set_source_files_properties("../../shared/images/tiff/rgb_orientation_4.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/rgb_orientation_4.tiff" -) -set_source_files_properties("../../shared/images/tiff/rgb_orientation_5.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/rgb_orientation_5.tiff" -) -set_source_files_properties("../../shared/images/tiff/rgb_orientation_6.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/rgb_orientation_6.tiff" -) -set_source_files_properties("../../shared/images/tiff/rgb_orientation_7.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/rgb_orientation_7.tiff" -) -set_source_files_properties("../../shared/images/tiff/rgb_orientation_8.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/rgb_orientation_8.tiff" -) -set_source_files_properties("../../shared/images/tiff/rgba_adobedeflate_littleendian.tif" - PROPERTIES QT_RESOURCE_ALIAS "tiff/rgba_adobedeflate_littleendian.tif" -) -set_source_files_properties("../../shared/images/tiff/rgba_lzw_littleendian.tif" - PROPERTIES QT_RESOURCE_ALIAS "tiff/rgba_lzw_littleendian.tif" -) -set_source_files_properties("../../shared/images/tiff/rgba_nocompression_bigendian.tif" - PROPERTIES QT_RESOURCE_ALIAS "tiff/rgba_nocompression_bigendian.tif" -) -set_source_files_properties("../../shared/images/tiff/rgba_nocompression_littleendian.tif" - PROPERTIES QT_RESOURCE_ALIAS "tiff/rgba_nocompression_littleendian.tif" -) -set_source_files_properties("../../shared/images/tiff/rgba_packbits_littleendian.tif" - PROPERTIES QT_RESOURCE_ALIAS "tiff/rgba_packbits_littleendian.tif" -) -set_source_files_properties("../../shared/images/tiff/rgba_zipdeflate_littleendian.tif" - PROPERTIES QT_RESOURCE_ALIAS "tiff/rgba_zipdeflate_littleendian.tif" -) -set_source_files_properties("../../shared/images/tiff/teapot.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/teapot.tiff" -) -set_source_files_properties("../../shared/images/tiff/tiled_grayscale.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/tiled_grayscale.tiff" -) -set_source_files_properties("../../shared/images/tiff/tiled_indexed.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/tiled_indexed.tiff" -) -set_source_files_properties("../../shared/images/tiff/tiled_mono.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/tiled_mono.tiff" -) -set_source_files_properties("../../shared/images/tiff/tiled_oddsize_grayscale.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/tiled_oddsize_grayscale.tiff" -) -set_source_files_properties("../../shared/images/tiff/tiled_oddsize_mono.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/tiled_oddsize_mono.tiff" -) -set_source_files_properties("../../shared/images/tiff/tiled_rgb.tiff" - PROPERTIES QT_RESOURCE_ALIAS "tiff/tiled_rgb.tiff" -) set(tiff_resource_files - "tiff/16bpc.tiff" - "tiff/big_16bpc.tiff" - "tiff/big_grayscale.tiff" - "tiff/big_rgb.tiff" - "tiff/big_rgb_bigendian.tiff" - "tiff/colorful.bmp" - "tiff/corrupt-data.tif" - "tiff/gray16.tiff" - "tiff/grayscale-ref.tif" - "tiff/grayscale.tif" - "tiff/image.tif" - "tiff/image_100dpi.tif" - "tiff/indexed_orientation_1.tiff" - "tiff/indexed_orientation_2.tiff" - "tiff/indexed_orientation_3.tiff" - "tiff/indexed_orientation_4.tiff" - "tiff/indexed_orientation_5.tiff" - "tiff/indexed_orientation_6.tiff" - "tiff/indexed_orientation_7.tiff" - "tiff/indexed_orientation_8.tiff" - "tiff/mono_orientation_1.tiff" - "tiff/mono_orientation_2.tiff" - "tiff/mono_orientation_3.tiff" - "tiff/mono_orientation_4.tiff" - "tiff/mono_orientation_5.tiff" - "tiff/mono_orientation_6.tiff" - "tiff/mono_orientation_7.tiff" - "tiff/mono_orientation_8.tiff" - "tiff/multipage.tiff" - "tiff/oddsize_grayscale.tiff" - "tiff/oddsize_mono.tiff" - "tiff/original_grayscale.tiff" - "tiff/original_indexed.tiff" - "tiff/original_mono.tiff" - "tiff/original_rgb.tiff" - "tiff/rgb_orientation_1.tiff" - "tiff/rgb_orientation_2.tiff" - "tiff/rgb_orientation_3.tiff" - "tiff/rgb_orientation_4.tiff" - "tiff/rgb_orientation_5.tiff" - "tiff/rgb_orientation_6.tiff" - "tiff/rgb_orientation_7.tiff" - "tiff/rgb_orientation_8.tiff" - "tiff/rgba_adobedeflate_littleendian.tif" - "tiff/rgba_lzw_littleendian.tif" - "tiff/rgba_nocompression_bigendian.tif" - "tiff/rgba_nocompression_littleendian.tif" - "tiff/rgba_packbits_littleendian.tif" - "tiff/rgba_zipdeflate_littleendian.tif" - "tiff/teapot.tiff" - "tiff/tiled_grayscale.tiff" - "tiff/tiled_indexed.tiff" - "tiff/tiled_mono.tiff" - "tiff/tiled_oddsize_grayscale.tiff" - "tiff/tiled_oddsize_mono.tiff" - "tiff/tiled_rgb.tiff" + "../../shared/images/tiff/16bpc.tiff" + "../../shared/images/tiff/big_16bpc.tiff" + "../../shared/images/tiff/big_grayscale.tiff" + "../../shared/images/tiff/big_rgb.tiff" + "../../shared/images/tiff/big_rgb_bigendian.tiff" + "../../shared/images/tiff/colorful.bmp" + "../../shared/images/tiff/corrupt-data.tif" + "../../shared/images/tiff/gray16.tiff" + "../../shared/images/tiff/grayscale-ref.tif" + "../../shared/images/tiff/grayscale.tif" + "../../shared/images/tiff/image.tif" + "../../shared/images/tiff/image_100dpi.tif" + "../../shared/images/tiff/indexed_orientation_1.tiff" + "../../shared/images/tiff/indexed_orientation_2.tiff" + "../../shared/images/tiff/indexed_orientation_3.tiff" + "../../shared/images/tiff/indexed_orientation_4.tiff" + "../../shared/images/tiff/indexed_orientation_5.tiff" + "../../shared/images/tiff/indexed_orientation_6.tiff" + "../../shared/images/tiff/indexed_orientation_7.tiff" + "../../shared/images/tiff/indexed_orientation_8.tiff" + "../../shared/images/tiff/mono_orientation_1.tiff" + "../../shared/images/tiff/mono_orientation_2.tiff" + "../../shared/images/tiff/mono_orientation_3.tiff" + "../../shared/images/tiff/mono_orientation_4.tiff" + "../../shared/images/tiff/mono_orientation_5.tiff" + "../../shared/images/tiff/mono_orientation_6.tiff" + "../../shared/images/tiff/mono_orientation_7.tiff" + "../../shared/images/tiff/mono_orientation_8.tiff" + "../../shared/images/tiff/multipage.tiff" + "../../shared/images/tiff/oddsize_grayscale.tiff" + "../../shared/images/tiff/oddsize_mono.tiff" + "../../shared/images/tiff/original_grayscale.tiff" + "../../shared/images/tiff/original_indexed.tiff" + "../../shared/images/tiff/original_mono.tiff" + "../../shared/images/tiff/original_rgb.tiff" + "../../shared/images/tiff/rgb_orientation_1.tiff" + "../../shared/images/tiff/rgb_orientation_2.tiff" + "../../shared/images/tiff/rgb_orientation_3.tiff" + "../../shared/images/tiff/rgb_orientation_4.tiff" + "../../shared/images/tiff/rgb_orientation_5.tiff" + "../../shared/images/tiff/rgb_orientation_6.tiff" + "../../shared/images/tiff/rgb_orientation_7.tiff" + "../../shared/images/tiff/rgb_orientation_8.tiff" + "../../shared/images/tiff/rgba_adobedeflate_littleendian.tif" + "../../shared/images/tiff/rgba_lzw_littleendian.tif" + "../../shared/images/tiff/rgba_nocompression_bigendian.tif" + "../../shared/images/tiff/rgba_nocompression_littleendian.tif" + "../../shared/images/tiff/rgba_packbits_littleendian.tif" + "../../shared/images/tiff/rgba_zipdeflate_littleendian.tif" + "../../shared/images/tiff/teapot.tiff" + "../../shared/images/tiff/tiled_grayscale.tiff" + "../../shared/images/tiff/tiled_indexed.tiff" + "../../shared/images/tiff/tiled_mono.tiff" + "../../shared/images/tiff/tiled_oddsize_grayscale.tiff" + "../../shared/images/tiff/tiled_oddsize_mono.tiff" + "../../shared/images/tiff/tiled_rgb.tiff" ) qt_internal_add_resource(tst_bench_qtiff "tiff" @@ -248,4 +80,3 @@ FILES ${tiff_resource_files} ) -