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-05-10 15:38:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-imageformats (Old) and /work/SRC/openSUSE:Factory/.qt6-imageformats.new.2988 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-imageformats" Mon May 10 15:38:30 2021 rev:4 rq:891705 version:6.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-imageformats/qt6-imageformats.changes 2021-04-06 17:32:06.631281810 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-imageformats.new.2988/qt6-imageformats.changes 2021-05-10 15:40:56.689188617 +0200 @@ -1,0 +2,16 @@ +Thu May 6 17:10:20 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 6.1.0: + * https://www.qt.io/blog/qt-6.1-released + +------------------------------------------------------------------- +Fri Apr 23 14:11:36 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 6.1.0-rc. + +------------------------------------------------------------------- +Tue Apr 13 06:35:32 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 6.1.0-beta3. + +------------------------------------------------------------------- @@ -5,0 +22,11 @@ + +------------------------------------------------------------------- +Fri Mar 19 15:46:14 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 6.1.0-beta2 + +------------------------------------------------------------------- +Fri Mar 5 17:24:01 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 6.1.0-beta1 + https://www.qt.io/blog/qt-6.1-beta-released Old: ---- qtimageformats-everywhere-src-6.0.3.tar.xz New: ---- qtimageformats-everywhere-src-6.1.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-imageformats.spec ++++++ --- /var/tmp/diff_new_pack.bwea6S/_old 2021-05-10 15:40:57.237186459 +0200 +++ /var/tmp/diff_new_pack.bwea6S/_new 2021-05-10 15:40:57.237186459 +0200 @@ -16,8 +16,8 @@ # -%define real_version 6.0.3 -%define short_version 6.0 +%define real_version 6.1.0 +%define short_version 6.1 %define short_name qtimageformats %define tar_name qtimageformats-everywhere-src %define tar_suffix %{nil} @@ -28,12 +28,12 @@ %endif # Name: qt6-imageformats%{?pkg_suffix} -Version: 6.0.3 +Version: 6.1.0 Release: 0 Summary: Qt 6 ImageFormat Plugins License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) URL: https://www.qt.io -Source: https://download.qt.io/official_releases/additional_libraries/%{short_version}/%{real_version}/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz +Source: https://download.qt.io/official_releases/qt/%{short_version}/%{real_version}%{tar_suffix}/submodules/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz Source99: qt6-imageformats-rpmlintrc BuildRequires: libtiff-devel BuildRequires: pkgconfig @@ -81,6 +81,7 @@ %{_qt6_pluginsdir}/imageformats/ %files devel +%{_qt6_cmakedir}/Qt6/FindLibmng.cmake %{_qt6_cmakedir}/Qt6/FindWrapJasper.cmake %{_qt6_cmakedir}/Qt6/FindWrapWebP.cmake %{_qt6_cmakedir}/Qt6Gui/* ++++++ qtimageformats-everywhere-src-6.0.3.tar.xz -> qtimageformats-everywhere-src-6.1.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/.cmake.conf new/qtimageformats-everywhere-src-6.1.0/.cmake.conf --- old/qtimageformats-everywhere-src-6.0.3/.cmake.conf 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/.cmake.conf 2021-05-03 11:49:13.000000000 +0200 @@ -1 +1 @@ -set(QT_REPO_MODULE_VERSION "6.0.3") +set(QT_REPO_MODULE_VERSION "6.1.0") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/.prev_CMakeLists.txt new/qtimageformats-everywhere-src-6.1.0/.prev_CMakeLists.txt --- old/qtimageformats-everywhere-src-6.0.3/.prev_CMakeLists.txt 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/.prev_CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -# Generated from qtimageformats.pro. - -cmake_minimum_required(VERSION 3.15.0) - -include(.cmake.conf) -project(imageformats_FIXME - VERSION "${QT_REPO_MODULE_VERSION}" - DESCRIPTION "Qt imageformats_FIXME Libraries" - HOMEPAGE_URL "https://qt.io/" - LANGUAGES CXX C -) - -find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core SET_ME_TO_SOMETHING_USEFUL) -find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS SET_ME_TO_SOMETHING_USEFUL) - -if(NOT TARGET Qt::Gui) - message(NOTICE "Skipping the build as the condition \"TARGET Qt::Gui\" is not met.") - return() -endif() -qt_build_repo() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/.qmake.conf new/qtimageformats-everywhere-src-6.1.0/.qmake.conf --- old/qtimageformats-everywhere-src-6.0.3/.qmake.conf 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/.qmake.conf 2021-05-03 11:49:13.000000000 +0200 @@ -2,5 +2,5 @@ DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS -MODULE_VERSION = 6.0.3 +MODULE_VERSION = 6.1.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/.tag new/qtimageformats-everywhere-src-6.1.0/.tag --- old/qtimageformats-everywhere-src-6.0.3/.tag 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/.tag 2021-05-03 11:49:13.000000000 +0200 @@ -1 +1 @@ -a8ceead2aae26974b72a233779ececac36f28bf0 +e26917ebf0221c9f6ab5575ca95ae0df1e80b3fb diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/cmake/FindLibmng.cmake new/qtimageformats-everywhere-src-6.1.0/cmake/FindLibmng.cmake --- old/qtimageformats-everywhere-src-6.0.3/cmake/FindLibmng.cmake 1970-01-01 01:00:00.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/cmake/FindLibmng.cmake 2021-05-03 11:49:13.000000000 +0200 @@ -0,0 +1,35 @@ +if(TARGET Libmng::Libmng) + set(Libmng_FOUND TRUE) + return() +endif() + +find_package(PkgConfig QUIET) + +if(PkgConfig_FOUND) + pkg_check_modules(Libmng IMPORTED_TARGET libmng) + + if(TARGET PkgConfig::Libmng) + add_library(Libmng::Libmng INTERFACE IMPORTED) + target_link_libraries(Libmng::Libmng INTERFACE PkgConfig::Libmng) + set(Libmng_FOUND TRUE) + endif() +endif() + +if(NOT TARGET Libmng::Libmng) + find_library(LIBMNG_LIBRARY NAMES mng) + find_path(LIBMNG_INCLUDE_DIR libmng.h) + + if(LIBMNG_LIBRARY AND LIBMNG_INCLUDE_DIR) + add_library(Libmng::Libmng UNKNOWN IMPORTED) + set_target_properties(Libmng::Libmng PROPERTIES + IMPORTED_LOCATION ${LIBMNG_LIBRARY} + INTERFACE_INCLUDE_DIRECTORIES ${LIBMNG_INCLUDE_DIR} + ) + endif() + + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(Libmng REQUIRED_VARS + LIBMNG_LIBRARY + LIBMNG_INCLUDE_DIR + ) +endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/cmake/FindWrapJasper.cmake new/qtimageformats-everywhere-src-6.1.0/cmake/FindWrapJasper.cmake --- old/qtimageformats-everywhere-src-6.0.3/cmake/FindWrapJasper.cmake 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/cmake/FindWrapJasper.cmake 2021-05-03 11:49:13.000000000 +0200 @@ -1,3 +1,10 @@ +# We can't create the same interface imported target multiple times, CMake will complain if we do +# that. This can happen if the find_package call is done in multiple different subdirectories. +if(TARGET WrapJasper::WrapJasper) + set(WrapJasper_FOUND TRUE) + return() +endif() + set(WrapJasper_FOUND OFF) find_package(Jasper) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/cmake/FindWrapWebP.cmake new/qtimageformats-everywhere-src-6.1.0/cmake/FindWrapWebP.cmake --- old/qtimageformats-everywhere-src-6.0.3/cmake/FindWrapWebP.cmake 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/cmake/FindWrapWebP.cmake 2021-05-03 11:49:13.000000000 +0200 @@ -5,6 +5,13 @@ # So try config files first, and then use the regular find_library / find_path dance with pkg-config # paths as hints. +# We can't create the same interface imported target multiple times, CMake will complain if we do +# that. This can happen if the find_package call is done in multiple different subdirectories. +if(TARGET WrapWebP::WrapWebP) + set(WrapWebP_FOUND TRUE) + return() +endif() + find_package(WebP QUIET) if(TARGET WebP::webp AND TARGET WebP::webpdemux AND TARGET WebP::libwebpmux) set(WrapWebP_FOUND ON) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/coin/module_config.yaml new/qtimageformats-everywhere-src-6.1.0/coin/module_config.yaml --- old/qtimageformats-everywhere-src-6.0.3/coin/module_config.yaml 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/coin/module_config.yaml 2021-05-03 11:49:13.000000000 +0200 @@ -6,9 +6,6 @@ instructions: Build: - - type: EnvironmentVariable - variableName: BUILD_DOCUMENTATION - variableValue: "1" - !include "{{qt/qtbase}}/coin_module_build_template_v2.yaml" Test: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/conanfile.py new/qtimageformats-everywhere-src-6.1.0/conanfile.py --- old/qtimageformats-everywhere-src-6.0.3/conanfile.py 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/conanfile.py 2021-05-03 11:49:13.000000000 +0200 @@ -36,7 +36,7 @@ class QtImageFormats(ConanFile): name = "qtimageformats" - version = "6.0.3" + version = "6.1.0" 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,17 +48,18 @@ default_options = {"shared": False, "qt6": None} exports_sources = "*", "!conan*.*" + revision_mode = "scm" # use commit ID as the RREV (recipe revision) def source(self): # sources are installed next to recipe, no need to clone etc. sources here pass def _get_cmake_prefix_path(self): - # 'QT_PATH' provided as env variable in profile file which is part of the Qt essential binary + # 'QTDIR' provided as env variable in profile file which is part of the Qt essential binary # package(s). Installed under .conan/profiles - cmake_prefix_path = os.environ.get("QT_PATH") + cmake_prefix_path = os.environ.get("QTDIR") if not cmake_prefix_path: - raise QtConanError("'QT_PATH' not defined! The 'QT_PATH' needs to point to Qt installation directory.") + raise QtConanError("'QTDIR' not defined! The 'QTDIR' needs to point to Qt installation directory.") print(f"CMAKE_PREFIX_PATH for '{self.name}/{self.version}' build is: {cmake_prefix_path}") return cmake_prefix_path @@ -73,7 +74,7 @@ ext = ".bat" if tools.os_info.is_windows else "" qtcmake = os.path.abspath(os.path.join(qt_install_path, "bin", "qt-cmake" + ext)) if not os.path.exists(qtcmake): - raise QtConanError(f"Unable to locate {qtcmake} from 'QT_PATH': {qt_install_path}") + raise QtConanError(f"Unable to locate {qtcmake} from 'QTDIR': {qt_install_path}") return qtcmake def _get_cmake_tool(self): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/dependencies.yaml new/qtimageformats-everywhere-src-6.1.0/dependencies.yaml --- old/qtimageformats-everywhere-src-6.0.3/dependencies.yaml 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/dependencies.yaml 2021-05-03 11:49:13.000000000 +0200 @@ -1,7 +1,4 @@ dependencies: ../qtbase: - ref: 0ff1dc7110d373c85ce41e90073291b5e2eb16ad - required: true - ../qttools: - ref: 792adc3dd0f59a56273189f290c3edc327e140b7 + ref: b2ebc64dd9914359fe8acf2bc9960e341e98cf80 required: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/dist/changes-6.0.x new/qtimageformats-everywhere-src-6.1.0/dist/changes-6.0.x --- old/qtimageformats-everywhere-src-6.0.3/dist/changes-6.0.x 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/dist/changes-6.0.x 1970-01-01 01:00:00.000000000 +0100 @@ -1,19 +0,0 @@ -Qt 6.0.x releases are bug fix releases to the top of Qt 6.0.0. - -List of changes compared to the previous patch release can be found from -https://wiki.qt.io/Qt_6.0.x_Changes -wiki - -The goal has been to retain as much source compatibility with Qt 5.15 as -possible, but some changes were inevitable to make Qt a better framework. - -To make it easier to port to Qt 6.0, we have created a porting guide to -summarize those changes and provide guidance to handle them. In the guide, you -can find links to articles about changes that may affect your application and -help you transition from Qt 5.15 to Qt 6.0: - -https://doc.qt.io/qt-6/portingguide.html - -For more details refer to the online documentation of Qt 6.0: - -https://doc.qt.io/qt-6/index.html - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/qtimageformats.pro new/qtimageformats-everywhere-src-6.1.0/qtimageformats.pro --- old/qtimageformats-everywhere-src-6.0.3/qtimageformats.pro 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/qtimageformats.pro 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -requires(qtHaveModule(gui)) - -load(qt_parts) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/src/imageformats/.prev_CMakeLists.txt new/qtimageformats-everywhere-src-6.1.0/src/imageformats/.prev_CMakeLists.txt --- old/qtimageformats-everywhere-src-6.0.3/src/imageformats/.prev_CMakeLists.txt 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/src/imageformats/.prev_CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -# Generated from imageformats.pro. - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/src/imageformats/configure.cmake new/qtimageformats-everywhere-src-6.1.0/src/imageformats/configure.cmake --- old/qtimageformats-everywhere-src-6.0.3/src/imageformats/configure.cmake 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/src/imageformats/configure.cmake 2021-05-03 11:49:13.000000000 +0200 @@ -17,6 +17,7 @@ qt_find_package(WrapJasper PROVIDED_TARGETS WrapJasper::WrapJasper MODULE_NAME imageformats QMAKE_LIB jasper) qt_find_package(TIFF PROVIDED_TARGETS TIFF::TIFF MODULE_NAME imageformats QMAKE_LIB tiff) qt_find_package(WrapWebP PROVIDED_TARGETS WrapWebP::WrapWebP MODULE_NAME imageformats QMAKE_LIB webp) +qt_find_package(Libmng PROVIDED_TARGETS Libmng::Libmng MODULE_NAME imageformats QMAKE_LIB mng) #### Tests @@ -33,7 +34,7 @@ qt_feature_definition("jasper" "QT_NO_IMAGEFORMAT_JASPER" NEGATE) qt_feature("mng" PRIVATE LABEL "MNG" - CONDITION libs.mng OR FIXME + CONDITION Libmng_FOUND DISABLE INPUT_mng STREQUAL 'no' ) qt_feature("tiff" PRIVATE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/src/imageformats/imageformats.pro new/qtimageformats-everywhere-src-6.1.0/src/imageformats/imageformats.pro --- old/qtimageformats-everywhere-src-6.0.3/src/imageformats/imageformats.pro 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/src/imageformats/imageformats.pro 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -TEMPLATE = aux -CONFIG += prepare_docs qt_docs_targets -QMAKE_DOCS = $$PWD/doc/qtimageformats.qdocconf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/.prev_CMakeLists.txt new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/.prev_CMakeLists.txt --- old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/.prev_CMakeLists.txt 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/.prev_CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,25 +0,0 @@ -# Generated from imageformats.pro. - -add_subdirectory(tga) -add_subdirectory(wbmp) -if(QT_FEATURE_tiff) - add_subdirectory(tiff) -endif() -if(QT_FEATURE_webp) - add_subdirectory(webp) -endif() -if(APPLE) - add_subdirectory(macheif) -endif() -if(QT_FEATURE_regularexpression) - add_subdirectory(icns) -endif() -if(QT_FEATURE_mng) - add_subdirectory(mng) -endif() -if(QT_FEATURE_jasper) - add_subdirectory(jp2) -endif() -if(APPLE AND NOT QT_FEATURE_jasper) - add_subdirectory(macjp2) -endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/CMakeLists.txt new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/CMakeLists.txt --- old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/CMakeLists.txt 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/CMakeLists.txt 2021-05-03 11:49:13.000000000 +0200 @@ -24,7 +24,7 @@ if(QT_FEATURE_regularexpression) add_subdirectory(icns) endif() -if(QT_FEATURE_mng AND OFF) # special case: FIXME +if(QT_FEATURE_mng) add_subdirectory(mng) endif() if(QT_FEATURE_jasper) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/dds/dds.pro new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/dds/dds.pro --- old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/dds/dds.pro 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/dds/dds.pro 1970-01-01 01:00:00.000000000 +0100 @@ -1,16 +0,0 @@ -TARGET = qdds - -HEADERS += \ - ddsheader.h \ - qddshandler.h - -SOURCES += \ - ddsheader.cpp \ - main.cpp \ - qddshandler.cpp - -OTHER_FILES += dds.json - -PLUGIN_TYPE = imageformats -PLUGIN_CLASS_NAME = QDDSPlugin -load(qt_plugin) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/icns/.prev_CMakeLists.txt new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/icns/.prev_CMakeLists.txt --- old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/icns/.prev_CMakeLists.txt 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/icns/.prev_CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -# Generated from icns.pro. - -##################################################################### -## QICNSPlugin Plugin: -##################################################################### - -qt_add_plugin(QICNSPlugin - OUTPUT_NAME qicns - TYPE imageformats - SOURCES - main.cpp - qicnshandler.cpp qicnshandler_p.h - DEFINES - QT_NO_CAST_FROM_ASCII - QT_NO_CAST_TO_ASCII - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui -) - -#### Keys ignored in scope 1:.:.:icns.pro:<TRUE>: -# OTHER_FILES = "icns.json" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/icns/icns.pro new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/icns/icns.pro --- old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/icns/icns.pro 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/icns/icns.pro 1970-01-01 01:00:00.000000000 +0100 @@ -1,16 +0,0 @@ -TARGET = qicns - -DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII - -HEADERS += \ - qicnshandler_p.h - -SOURCES += \ - main.cpp \ - qicnshandler.cpp - -OTHER_FILES += icns.json - -PLUGIN_TYPE = imageformats -PLUGIN_CLASS_NAME = QICNSPlugin -load(qt_plugin) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/icns/qicnshandler.cpp new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/icns/qicnshandler.cpp --- old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/icns/qicnshandler.cpp 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/icns/qicnshandler.cpp 2021-05-03 11:49:13.000000000 +0200 @@ -534,7 +534,9 @@ const qint64 oldPos = stream.device()->pos(); if (!stream.device()->seek(pos)) return QImage(); - QImage img(mask.width, mask.height, QImage::Format_RGB32); + QImage img; + if (!QImageIOHandler::allocateImage(QSize(mask.width, mask.height), QImage::Format_RGB32, &img)) + return QImage(); quint8 byte = 0; quint32 pixel = 0; for (quint32 y = 0; y < mask.height; y++) { @@ -564,7 +566,9 @@ const QList<QRgb> colortable = getColorTable(depth); if (colortable.isEmpty()) return QImage(); - QImage img(icon.width, icon.height, format); + QImage img; + if (!QImageIOHandler::allocateImage(QSize(icon.width, icon.height), format, &img)) + return QImage(); img.setColorTable(colortable); quint32 pixel = 0; quint8 byte = 0; @@ -595,7 +599,9 @@ static QImage read32bitIcon(const ICNSEntry &icon, QDataStream &stream) { - QImage img = QImage(icon.width, icon.height, QImage::Format_RGB32); + QImage img; + if (!QImageIOHandler::allocateImage(QSize(icon.width, icon.height), QImage::Format_RGB32, &img)) + return QImage(); if (icon.dataFormat != ICNSEntry::RLE24) { for (quint32 y = 0; y < icon.height; y++) { QRgb *line = reinterpret_cast<QRgb *>(img.scanLine(y)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/imageformats.pro new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/imageformats.pro --- old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/imageformats.pro 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/imageformats.pro 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS = \ -# dds \ - tga \ - wbmp - -include($$OUT_PWD/../../imageformats/qtimageformats-config.pri) -QT_FOR_CONFIG += imageformats-private - -qtConfig(tiff): SUBDIRS += tiff -qtConfig(webp): SUBDIRS += webp - -darwin: SUBDIRS += macheif - -qtConfig(regularexpression): \ - SUBDIRS += icns - -qtConfig(mng): SUBDIRS += mng -qtConfig(jasper) { - SUBDIRS += jp2 -} else:darwin: { - SUBDIRS += macjp2 -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/jp2/.prev_CMakeLists.txt new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/jp2/.prev_CMakeLists.txt --- old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/jp2/.prev_CMakeLists.txt 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/jp2/.prev_CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -# Generated from jp2.pro. - -##################################################################### -## QJp2Plugin Plugin: -##################################################################### - -qt_add_plugin(QJp2Plugin - OUTPUT_NAME qjp2 - TYPE imageformats - SOURCES - main.cpp - qjp2handler.cpp qjp2handler_p.h - LIBRARIES - WrapJasper::WrapJasper - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui -) - -#### Keys ignored in scope 1:.:.:jp2.pro:<TRUE>: -# OTHER_FILES = "jp2.json" -# QT_FOR_CONFIG = "imageformats-private" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/jp2/jp2.pro new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/jp2/jp2.pro --- old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/jp2/jp2.pro 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/jp2/jp2.pro 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ -TARGET = qjp2 - -HEADERS += qjp2handler_p.h -SOURCES += main.cpp \ - qjp2handler.cpp -OTHER_FILES += jp2.json - -include($$OUT_PWD/../../../imageformats/qtimageformats-config.pri) -QT_FOR_CONFIG += imageformats-private - -QMAKE_USE_PRIVATE += jasper - -PLUGIN_TYPE = imageformats -PLUGIN_CLASS_NAME = QJp2Plugin -load(qt_plugin) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/jp2/qjp2handler.cpp new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/jp2/qjp2handler.cpp --- old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/jp2/qjp2handler.cpp 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/jp2/qjp2handler.cpp 2021-05-03 11:49:13.000000000 +0200 @@ -573,17 +573,13 @@ } // Create a QImage of the correct type - if (jasperColorspaceFamily == JAS_CLRSPC_FAM_RGB) { - qtImage = QImage(qtWidth, qtHeight, hasAlpha - ? QImage::Format_ARGB32 - : QImage::Format_RGB32); - } else if (jasperColorspaceFamily == JAS_CLRSPC_FAM_GRAY) { - if (hasAlpha) { - qtImage = QImage(qtWidth, qtHeight, QImage::Format_ARGB32); - } else { - qtImage = QImage(qtWidth, qtHeight, QImage::Format_Grayscale8); - } - } + QImage::Format qtFormat = QImage::Format_Invalid; + if (jasperColorspaceFamily == JAS_CLRSPC_FAM_RGB) + qtFormat = hasAlpha ? QImage::Format_ARGB32 : QImage::Format_RGB32; + else if (jasperColorspaceFamily == JAS_CLRSPC_FAM_GRAY) + qtFormat = hasAlpha ? QImage::Format_ARGB32 : QImage::Format_Grayscale8; + if (!QImageIOHandler::allocateImage(QSize(qtWidth, qtHeight), qtFormat, &qtImage)) + return false; // Copy data if (oddComponentSubsampling) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/macheif/.prev_CMakeLists.txt new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/macheif/.prev_CMakeLists.txt --- old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/macheif/.prev_CMakeLists.txt 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/macheif/.prev_CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,27 +0,0 @@ -# Generated from macheif.pro. - -##################################################################### -## QMacHeifPlugin Plugin: -##################################################################### - -qt_internal_add_plugin(QMacHeifPlugin - OUTPUT_NAME qmacheif - TYPE imageformats - SOURCES - ../shared/qiiofhelpers.cpp ../shared/qiiofhelpers_p.h - main.cpp - qmacheifhandler.cpp qmacheifhandler.h - INCLUDE_DIRECTORIES - ../shared - PUBLIC_LIBRARIES - ${FWCoreFoundation} - ${FWCoreGraphics} - ${FWImageIO} - Qt::Core - Qt::CorePrivate - Qt::Gui - Qt::GuiPrivate -) - -#### Keys ignored in scope 1:.:.:macheif.pro:<TRUE>: -# OTHER_FILES = "macheif.json" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/macheif/macheif.pro new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/macheif/macheif.pro --- old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/macheif/macheif.pro 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/macheif/macheif.pro 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -TARGET = qmacheif -PLUGIN_TYPE = imageformats -PLUGIN_CLASS_NAME = QMacHeifPlugin - -LIBS += -framework CoreFoundation -framework CoreGraphics -framework ImageIO - -QT += core-private gui-private - -SOURCES += \ - qmacheifhandler.cpp \ - main.cpp - -HEADERS += \ - qmacheifhandler.h - -include (../shared/qiiofhelpers.pri) - -OTHER_FILES += macheif.json - -load(qt_plugin) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/macjp2/macjp2.pro new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/macjp2/macjp2.pro --- old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/macjp2/macjp2.pro 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/macjp2/macjp2.pro 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -TARGET = qmacjp2 -PLUGIN_TYPE = imageformats -PLUGIN_CLASS_NAME = QMacJp2Plugin - -LIBS += -framework CoreFoundation -framework CoreGraphics -framework ImageIO - -QT += core-private gui-private - -SOURCES += \ - qmacjp2handler.cpp \ - main.cpp - -HEADERS += \ - qmacjp2handler.h - -include (../shared/qiiofhelpers.pri) - -OTHER_FILES += macjp2.json - -load(qt_plugin) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/mng/CMakeLists.txt new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/mng/CMakeLists.txt --- old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/mng/CMakeLists.txt 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/mng/CMakeLists.txt 2021-05-03 11:49:13.000000000 +0200 @@ -11,7 +11,7 @@ main.cpp qmnghandler.cpp qmnghandler_p.h LIBRARIES - mng + Libmng::Libmng PUBLIC_LIBRARIES Qt::Core Qt::Gui diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/mng/mng.pro new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/mng/mng.pro --- old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/mng/mng.pro 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/mng/mng.pro 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ -TARGET = qmng - -HEADERS += qmnghandler_p.h -SOURCES += main.cpp \ - qmnghandler.cpp -OTHER_FILES += mng.json - -include($$OUT_PWD/../../../imageformats/qtimageformats-config.pri) -QT_FOR_CONFIG += imageformats-private - -QMAKE_USE_PRIVATE += mng - -PLUGIN_TYPE = imageformats -PLUGIN_CLASS_NAME = QMngPlugin -load(qt_plugin) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/mng/qmnghandler.cpp new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/mng/qmnghandler.cpp --- old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/mng/qmnghandler.cpp 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/mng/qmnghandler.cpp 2021-05-03 11:49:13.000000000 +0200 @@ -247,7 +247,8 @@ { if (mng_set_canvasstyle(hMNG, iStyle) != MNG_NOERROR) return MNG_FALSE; - image = QImage(iWidth, iHeight, QImage::Format_ARGB32); + if (!QImageIOHandler::allocateImage(QSize(iWidth, iHeight), QImage::Format_ARGB32, &image)) + return MNG_FALSE; image.fill(0); return MNG_TRUE; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/tga/.prev_CMakeLists.txt new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/tga/.prev_CMakeLists.txt --- old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/tga/.prev_CMakeLists.txt 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/tga/.prev_CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -# Generated from tga.pro. - -##################################################################### -## QTgaPlugin Plugin: -##################################################################### - -qt_add_plugin(QTgaPlugin - OUTPUT_NAME qtga - TYPE imageformats - SOURCES - main.cpp - qtgafile.cpp qtgafile.h - qtgahandler.cpp qtgahandler.h - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui -) - -#### Keys ignored in scope 1:.:.:tga.pro:<TRUE>: -# OTHER_FILES = "tga.json" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/tga/qtgafile.cpp new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/tga/qtgafile.cpp --- old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/tga/qtgafile.cpp 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/tga/qtgafile.cpp 2021-05-03 11:49:13.000000000 +0200 @@ -42,6 +42,7 @@ #include <QtCore/QIODevice> #include <QtCore/QDebug> #include <QtCore/QDateTime> +#include <QtGui/QImageIOHandler> struct TgaReader { @@ -238,8 +239,8 @@ //unsigned char xCorner = desc & 0x10; // 0 = left, 1 = right unsigned char yCorner = desc & 0x20; // 0 = lower, 1 = upper - QImage im(imageWidth, imageHeight, QImage::Format_ARGB32); - if (im.isNull()) + QImage im; + if (!QImageIOHandler::allocateImage(QSize(imageWidth, imageHeight), QImage::Format_ARGB32, &im)) return QImage(); TgaReader *reader = 0; if (bitsPerPixel == 16) @@ -248,6 +249,8 @@ reader = new Tga24Reader(); else if (bitsPerPixel == 32) reader = new Tga32Reader(); + else + return QImage(); TgaReader &read = *reader; // For now only deal with yCorner, since no one uses xCorner == 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/tga/tga.pro new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/tga/tga.pro --- old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/tga/tga.pro 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/tga/tga.pro 1970-01-01 01:00:00.000000000 +0100 @@ -1,13 +0,0 @@ -TARGET = qtga - -HEADERS += qtgahandler.h \ - qtgafile.h -SOURCES += qtgahandler.cpp \ - qtgafile.cpp -OTHER_FILES += tga.json - -SOURCES += main.cpp - -PLUGIN_TYPE = imageformats -PLUGIN_CLASS_NAME = QTgaPlugin -load(qt_plugin) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/tiff/.prev_CMakeLists.txt new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/tiff/.prev_CMakeLists.txt --- old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/tiff/.prev_CMakeLists.txt 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/tiff/.prev_CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,93 +0,0 @@ -# Generated from tiff.pro. - -##################################################################### -## QTiffPlugin Plugin: -##################################################################### - -qt_internal_add_plugin(QTiffPlugin - OUTPUT_NAME qtiff - TYPE imageformats - SOURCES - main.cpp - qtiffhandler.cpp qtiffhandler_p.h - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui -) - -#### Keys ignored in scope 1:.:.:tiff.pro:<TRUE>: -# OTHER_FILES = "tiff.json" -# QT_FOR_CONFIG = "imageformats-private" - -## Scopes: -##################################################################### - -qt_internal_extend_target(QTiffPlugin CONDITION QT_FEATURE_system_tiff - LIBRARIES - TIFF::TIFF -) - -qt_internal_extend_target(QTiffPlugin CONDITION NOT QT_FEATURE_system_tiff - SOURCES - ../../../3rdparty/libtiff/libtiff/tif_aux.c - ../../../3rdparty/libtiff/libtiff/tif_close.c - ../../../3rdparty/libtiff/libtiff/tif_codec.c - ../../../3rdparty/libtiff/libtiff/tif_color.c - ../../../3rdparty/libtiff/libtiff/tif_compress.c - ../../../3rdparty/libtiff/libtiff/tif_dir.c - ../../../3rdparty/libtiff/libtiff/tif_dirinfo.c - ../../../3rdparty/libtiff/libtiff/tif_dirread.c - ../../../3rdparty/libtiff/libtiff/tif_dirwrite.c - ../../../3rdparty/libtiff/libtiff/tif_dumpmode.c - ../../../3rdparty/libtiff/libtiff/tif_error.c - ../../../3rdparty/libtiff/libtiff/tif_extension.c - ../../../3rdparty/libtiff/libtiff/tif_fax3.c - ../../../3rdparty/libtiff/libtiff/tif_fax3sm.c - ../../../3rdparty/libtiff/libtiff/tif_flush.c - ../../../3rdparty/libtiff/libtiff/tif_getimage.c - ../../../3rdparty/libtiff/libtiff/tif_luv.c - ../../../3rdparty/libtiff/libtiff/tif_lzw.c - ../../../3rdparty/libtiff/libtiff/tif_next.c - ../../../3rdparty/libtiff/libtiff/tif_open.c - ../../../3rdparty/libtiff/libtiff/tif_packbits.c - ../../../3rdparty/libtiff/libtiff/tif_pixarlog.c - ../../../3rdparty/libtiff/libtiff/tif_predict.c - ../../../3rdparty/libtiff/libtiff/tif_print.c - ../../../3rdparty/libtiff/libtiff/tif_read.c - ../../../3rdparty/libtiff/libtiff/tif_strip.c - ../../../3rdparty/libtiff/libtiff/tif_swab.c - ../../../3rdparty/libtiff/libtiff/tif_thunder.c - ../../../3rdparty/libtiff/libtiff/tif_tile.c - ../../../3rdparty/libtiff/libtiff/tif_version.c - ../../../3rdparty/libtiff/libtiff/tif_warning.c - ../../../3rdparty/libtiff/libtiff/tif_write.c - ../../../3rdparty/libtiff/libtiff/tif_zip.c - ../../../3rdparty/libtiff/port/snprintf.c - INCLUDE_DIRECTORIES - ../../../3rdparty/libtiff/libtiff -) - -qt_internal_extend_target(QTiffPlugin CONDITION WIN32 AND NOT QT_FEATURE_system_tiff - SOURCES - ../../../3rdparty/libtiff/libtiff/tif_win32.c -) - -qt_internal_extend_target(QTiffPlugin CONDITION UNIX AND NOT QT_FEATURE_system_tiff - SOURCES - ../../../3rdparty/libtiff/libtiff/tif_unix.c -) - -qt_internal_extend_target(QTiffPlugin CONDITION ANDROID AND NOT QT_FEATURE_system_tiff - SOURCES - ../../../3rdparty/libtiff/port/lfind.c -) - -qt_internal_extend_target(QTiffPlugin CONDITION QT_FEATURE_system_zlib AND NOT QT_FEATURE_system_tiff - LIBRARIES - ZLIB::ZLIB -) - -qt_internal_extend_target(QTiffPlugin CONDITION NOT QT_FEATURE_system_tiff AND NOT QT_FEATURE_system_zlib - LIBRARIES - Qt::ZlibPrivate -) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/tiff/qtiffhandler.cpp new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/tiff/qtiffhandler.cpp --- old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/tiff/qtiffhandler.cpp 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/tiff/qtiffhandler.cpp 2021-05-03 11:49:13.000000000 +0200 @@ -349,13 +349,7 @@ QImage::Format format = d->format; - if (image->size() == d->size && image->format() != format) - image->reinterpretAsFormat(format); - - if (image->size() != d->size || image->format() != format) - *image = QImage(d->size, format); - - if (image->isNull()) { + if (!QImageIOHandler::allocateImage(d->size, format, image)) { d->close(); return false; } @@ -430,9 +424,12 @@ quint32 byteWidth = (format == QImage::Format_Mono) ? (width + 7)/8 : (width * bytesPerPixel); quint32 byteTileWidth = (format == QImage::Format_Mono) ? tileWidth/8 : (tileWidth * bytesPerPixel); tmsize_t byteTileSize = TIFFTileSize(tiff); + if (byteTileSize > image->sizeInBytes() || byteTileSize / tileLength < byteTileWidth) { + d->close(); + return false; + } uchar *buf = (uchar *)_TIFFmalloc(byteTileSize); - if (!buf || byteTileSize / tileLength < byteTileWidth) { - _TIFFfree(buf); + if (!buf) { d->close(); return false; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/tiff/tiff.pro new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/tiff/tiff.pro --- old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/tiff/tiff.pro 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/tiff/tiff.pro 1970-01-01 01:00:00.000000000 +0100 @@ -1,18 +0,0 @@ -TARGET = qtiff - -HEADERS += qtiffhandler_p.h -SOURCES += main.cpp qtiffhandler.cpp -OTHER_FILES += tiff.json - -include($$OUT_PWD/../../../imageformats/qtimageformats-config.pri) -QT_FOR_CONFIG += imageformats-private - -qtConfig(system-tiff) { - QMAKE_USE_PRIVATE += tiff -} else { - include($$PWD/../../../3rdparty/libtiff.pri) -} - -PLUGIN_TYPE = imageformats -PLUGIN_CLASS_NAME = QTiffPlugin -load(qt_plugin) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/wbmp/.prev_CMakeLists.txt new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/wbmp/.prev_CMakeLists.txt --- old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/wbmp/.prev_CMakeLists.txt 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/wbmp/.prev_CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,19 +0,0 @@ -# Generated from wbmp.pro. - -##################################################################### -## QWbmpPlugin Plugin: -##################################################################### - -qt_add_plugin(QWbmpPlugin - OUTPUT_NAME qwbmp - TYPE imageformats - SOURCES - main.cpp - qwbmphandler.cpp qwbmphandler_p.h - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui -) - -#### Keys ignored in scope 1:.:.:wbmp.pro:<TRUE>: -# OTHER_FILES = "wbmp.json" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/wbmp/qwbmphandler.cpp new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/wbmp/qwbmphandler.cpp --- old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/wbmp/qwbmphandler.cpp 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/wbmp/qwbmphandler.cpp 2021-05-03 11:49:13.000000000 +0200 @@ -197,7 +197,9 @@ if (!readWBMPHeader(iodev, &hdr)) return QImage(); - QImage image(hdr.width, hdr.height, QImage::Format_Mono); + QImage image; + if (!QImageIOHandler::allocateImage(QSize(hdr.width, hdr.height), QImage::Format_Mono, &image)) + return QImage(); if (!readWBMPData(iodev, image)) return QImage(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/wbmp/wbmp.pro new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/wbmp/wbmp.pro --- old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/wbmp/wbmp.pro 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/wbmp/wbmp.pro 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -TARGET = qwbmp - -HEADERS += qwbmphandler_p.h -SOURCES += qwbmphandler.cpp -OTHER_FILES += wbmp.json - -SOURCES += main.cpp - -PLUGIN_TYPE = imageformats -PLUGIN_CLASS_NAME = QWbmpPlugin -load(qt_plugin) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/webp/.prev_CMakeLists.txt new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/webp/.prev_CMakeLists.txt --- old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/webp/.prev_CMakeLists.txt 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/webp/.prev_CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,173 +0,0 @@ -# Generated from webp.pro. - -##################################################################### -## QWebpPlugin Plugin: -##################################################################### - -qt_internal_add_plugin(QWebpPlugin - OUTPUT_NAME qwebp - TYPE imageformats - SOURCES - main.cpp - qwebphandler.cpp qwebphandler_p.h - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui -) - -#### Keys ignored in scope 1:.:.:webp.pro:<TRUE>: -# OTHER_FILES = "webp.json" -# QT_FOR_CONFIG = "imageformats-private" - -## Scopes: -##################################################################### - -qt_internal_extend_target(QWebpPlugin CONDITION QT_FEATURE_system_webp - PUBLIC_LIBRARIES - WrapWebP::WrapWebP -) - -qt_internal_extend_target(QWebpPlugin CONDITION NOT QT_FEATURE_system_webp - SOURCES - ../../../3rdparty/libwebp/src/dec/alpha_dec.c - ../../../3rdparty/libwebp/src/dec/buffer_dec.c - ../../../3rdparty/libwebp/src/dec/frame_dec.c - ../../../3rdparty/libwebp/src/dec/idec_dec.c - ../../../3rdparty/libwebp/src/dec/io_dec.c - ../../../3rdparty/libwebp/src/dec/quant_dec.c - ../../../3rdparty/libwebp/src/dec/tree_dec.c - ../../../3rdparty/libwebp/src/dec/vp8_dec.c - ../../../3rdparty/libwebp/src/dec/vp8l_dec.c - ../../../3rdparty/libwebp/src/dec/webp_dec.c - ../../../3rdparty/libwebp/src/demux/anim_decode.c - ../../../3rdparty/libwebp/src/demux/demux.c - ../../../3rdparty/libwebp/src/dsp/alpha_processing.c - ../../../3rdparty/libwebp/src/dsp/alpha_processing_mips_dsp_r2.c - ../../../3rdparty/libwebp/src/dsp/alpha_processing_sse2.c - ../../../3rdparty/libwebp/src/dsp/alpha_processing_sse41.c - ../../../3rdparty/libwebp/src/dsp/cost.c - ../../../3rdparty/libwebp/src/dsp/cost_mips32.c - ../../../3rdparty/libwebp/src/dsp/cost_mips_dsp_r2.c - ../../../3rdparty/libwebp/src/dsp/cost_neon.c - ../../../3rdparty/libwebp/src/dsp/cost_sse2.c - ../../../3rdparty/libwebp/src/dsp/cpu.c - ../../../3rdparty/libwebp/src/dsp/dec.c - ../../../3rdparty/libwebp/src/dsp/dec_clip_tables.c - ../../../3rdparty/libwebp/src/dsp/dec_mips32.c - ../../../3rdparty/libwebp/src/dsp/dec_mips_dsp_r2.c - ../../../3rdparty/libwebp/src/dsp/dec_msa.c - ../../../3rdparty/libwebp/src/dsp/dec_sse2.c - ../../../3rdparty/libwebp/src/dsp/dec_sse41.c - ../../../3rdparty/libwebp/src/dsp/enc.c - ../../../3rdparty/libwebp/src/dsp/enc_mips32.c - ../../../3rdparty/libwebp/src/dsp/enc_mips_dsp_r2.c - ../../../3rdparty/libwebp/src/dsp/enc_msa.c - ../../../3rdparty/libwebp/src/dsp/enc_sse2.c - ../../../3rdparty/libwebp/src/dsp/enc_sse41.c - ../../../3rdparty/libwebp/src/dsp/filters.c - ../../../3rdparty/libwebp/src/dsp/filters_mips_dsp_r2.c - ../../../3rdparty/libwebp/src/dsp/filters_msa.c - ../../../3rdparty/libwebp/src/dsp/filters_sse2.c - ../../../3rdparty/libwebp/src/dsp/lossless.c - ../../../3rdparty/libwebp/src/dsp/lossless_enc.c - ../../../3rdparty/libwebp/src/dsp/lossless_enc_mips32.c - ../../../3rdparty/libwebp/src/dsp/lossless_enc_mips_dsp_r2.c - ../../../3rdparty/libwebp/src/dsp/lossless_enc_msa.c - ../../../3rdparty/libwebp/src/dsp/lossless_enc_sse2.c - ../../../3rdparty/libwebp/src/dsp/lossless_enc_sse41.c - ../../../3rdparty/libwebp/src/dsp/lossless_mips_dsp_r2.c - ../../../3rdparty/libwebp/src/dsp/lossless_sse2.c - ../../../3rdparty/libwebp/src/dsp/rescaler.c - ../../../3rdparty/libwebp/src/dsp/rescaler_mips32.c - ../../../3rdparty/libwebp/src/dsp/rescaler_mips_dsp_r2.c - ../../../3rdparty/libwebp/src/dsp/rescaler_msa.c - ../../../3rdparty/libwebp/src/dsp/rescaler_sse2.c - ../../../3rdparty/libwebp/src/dsp/ssim.c - ../../../3rdparty/libwebp/src/dsp/ssim_sse2.c - ../../../3rdparty/libwebp/src/dsp/upsampling.c - ../../../3rdparty/libwebp/src/dsp/upsampling_mips_dsp_r2.c - ../../../3rdparty/libwebp/src/dsp/upsampling_msa.c - ../../../3rdparty/libwebp/src/dsp/upsampling_sse2.c - ../../../3rdparty/libwebp/src/dsp/upsampling_sse41.c - ../../../3rdparty/libwebp/src/dsp/yuv.c - ../../../3rdparty/libwebp/src/dsp/yuv_mips32.c - ../../../3rdparty/libwebp/src/dsp/yuv_mips_dsp_r2.c - ../../../3rdparty/libwebp/src/dsp/yuv_sse2.c - ../../../3rdparty/libwebp/src/dsp/yuv_sse41.c - ../../../3rdparty/libwebp/src/enc/alpha_enc.c - ../../../3rdparty/libwebp/src/enc/analysis_enc.c - ../../../3rdparty/libwebp/src/enc/backward_references_cost_enc.c - ../../../3rdparty/libwebp/src/enc/backward_references_enc.c - ../../../3rdparty/libwebp/src/enc/config_enc.c - ../../../3rdparty/libwebp/src/enc/cost_enc.c - ../../../3rdparty/libwebp/src/enc/filter_enc.c - ../../../3rdparty/libwebp/src/enc/frame_enc.c - ../../../3rdparty/libwebp/src/enc/histogram_enc.c - ../../../3rdparty/libwebp/src/enc/iterator_enc.c - ../../../3rdparty/libwebp/src/enc/near_lossless_enc.c - ../../../3rdparty/libwebp/src/enc/picture_csp_enc.c - ../../../3rdparty/libwebp/src/enc/picture_enc.c - ../../../3rdparty/libwebp/src/enc/picture_psnr_enc.c - ../../../3rdparty/libwebp/src/enc/picture_rescale_enc.c - ../../../3rdparty/libwebp/src/enc/picture_tools_enc.c - ../../../3rdparty/libwebp/src/enc/predictor_enc.c - ../../../3rdparty/libwebp/src/enc/quant_enc.c - ../../../3rdparty/libwebp/src/enc/syntax_enc.c - ../../../3rdparty/libwebp/src/enc/token_enc.c - ../../../3rdparty/libwebp/src/enc/tree_enc.c - ../../../3rdparty/libwebp/src/enc/vp8l_enc.c - ../../../3rdparty/libwebp/src/enc/webp_enc.c - ../../../3rdparty/libwebp/src/mux/anim_encode.c - ../../../3rdparty/libwebp/src/mux/muxedit.c - ../../../3rdparty/libwebp/src/mux/muxinternal.c - ../../../3rdparty/libwebp/src/mux/muxread.c - ../../../3rdparty/libwebp/src/utils/bit_reader_utils.c - ../../../3rdparty/libwebp/src/utils/bit_writer_utils.c - ../../../3rdparty/libwebp/src/utils/color_cache_utils.c - ../../../3rdparty/libwebp/src/utils/filters_utils.c - ../../../3rdparty/libwebp/src/utils/huffman_encode_utils.c - ../../../3rdparty/libwebp/src/utils/huffman_utils.c - ../../../3rdparty/libwebp/src/utils/quant_levels_dec_utils.c - ../../../3rdparty/libwebp/src/utils/quant_levels_utils.c - ../../../3rdparty/libwebp/src/utils/random_utils.c - ../../../3rdparty/libwebp/src/utils/rescaler_utils.c - ../../../3rdparty/libwebp/src/utils/thread_utils.c - ../../../3rdparty/libwebp/src/utils/utils.c - INCLUDE_DIRECTORIES - ../../../3rdparty/libwebp - ../../../3rdparty/libwebp/src - ../../../3rdparty/libwebp/src/dec - ../../../3rdparty/libwebp/src/dsp - ../../../3rdparty/libwebp/src/enc - ../../../3rdparty/libwebp/src/mux - ../../../3rdparty/libwebp/src/utils - ../../../3rdparty/libwebp/src/webp -) - -qt_internal_extend_target(QWebpPlugin CONDITION ANDROID AND NOT ANDROID_EMBEDDED AND NOT QT_FEATURE_system_webp - SOURCES - /sources/android/cpufeatures/cpu-features.c - INCLUDE_DIRECTORIES - /sources/android/cpufeatures -) - -#### Keys ignored in scope 6:.:../../../3rdparty:../../../3rdparty/libwebp.pri:INTEGRITY: -# QMAKE_CFLAGS = "-c99" - -#### Keys ignored in scope 12:.:../../../3rdparty:../../../3rdparty/libwebp.pri:else: -# QMAKE_EXTRA_COMPILERS = "neon_comp" -# neon_comp.commands = "$$QMAKE_CC" "-c" "$(CFLAGS)" "$$QMAKE_CFLAGS_NEON" "$(INCPATH)" "${QMAKE_FILE_IN}" -# neon_comp.dependency_type = "TYPE_C" -# neon_comp.input = "SOURCES_FOR_NEON" -# neon_comp.name = "compiling[neon]" "${QMAKE_FILE_IN}" -# neon_comp.output = "${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${firstQMAKE_EXT_OBJ}" -# neon_comp.variable_out = "OBJECTS" - -#### Keys ignored in scope 13:.:../../../3rdparty:../../../3rdparty/libwebp.pri:MSVC: -# neon_comp.commands = "-Fo${QMAKE_FILE_OUT}" - -#### Keys ignored in scope 14:.:../../../3rdparty:../../../3rdparty/libwebp.pri:else: -# neon_comp.commands = "-o" "${QMAKE_FILE_OUT}" - -#### Keys ignored in scope 15:.:../../../3rdparty:../../../3rdparty/libwebp.pri:silent: -# neon_comp.commands = "@echo" "compiling[neon]" "${QMAKE_FILE_IN}" "&&" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/webp/CMakeLists.txt new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/webp/CMakeLists.txt --- old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/webp/CMakeLists.txt 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/webp/CMakeLists.txt 2021-05-03 11:49:13.000000000 +0200 @@ -152,10 +152,7 @@ ) # special case begin -qt_internal_extend_target(QWebpPlugin - CONDITION (CMAKE_ANDROID_ARM_NEON OR CMAKE_ANDROID_ARCH_ABI STREQUAL "arm64-v8a") - AND NOT QT_FEATURE_system_webp - SOURCES +set(neon_sources ../../../3rdparty/libwebp/src/dsp/alpha_processing_neon.c ../../../3rdparty/libwebp/src/dsp/dec_neon.c ../../../3rdparty/libwebp/src/dsp/enc_neon.c @@ -166,6 +163,18 @@ ../../../3rdparty/libwebp/src/dsp/upsampling_neon.c ../../../3rdparty/libwebp/src/dsp/yuv_neon.c ) + +if(NOT QT_FEATURE_system_webp) + if(ANDROID) + qt_internal_extend_target(QWebpPlugin + CONDITION (CMAKE_ANDROID_ARM_NEON OR CMAKE_ANDROID_ARCH_ABI STREQUAL "arm64-v8a") + SOURCES ${neon_sources} + ) + else() + # For universal macOS and iOS, and other platforms that support neon + qt_internal_add_simd_part(QWebpPlugin SIMD neon SOURCES ${neon_sources}) + endif() +endif() # special case end #### Keys ignored in scope 6:.:../../../3rdparty:../../../3rdparty/libwebp.pri:INTEGRITY: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/webp/qwebphandler.cpp new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/webp/qwebphandler.cpp --- old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/webp/qwebphandler.cpp 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/webp/qwebphandler.cpp 2021-05-03 11:49:13.000000000 +0200 @@ -122,7 +122,10 @@ that->m_frameCount = WebPDemuxGetI(m_demuxer, WEBP_FF_FRAME_COUNT); that->m_bgColor = QColor::fromRgba(QRgb(WebPDemuxGetI(m_demuxer, WEBP_FF_BACKGROUND_COLOR))); - that->m_composited = new QImage(that->m_features.width, that->m_features.height, QImage::Format_ARGB32); + QSize sz(that->m_features.width, that->m_features.height); + that->m_composited = new QImage; + if (!QImageIOHandler::allocateImage(sz, QImage::Format_ARGB32, that->m_composited)) + return false; if (that->m_features.has_alpha) that->m_composited->fill(Qt::transparent); @@ -195,7 +198,9 @@ return false; QImage::Format format = m_features.has_alpha ? QImage::Format_ARGB32 : QImage::Format_RGB32; - QImage frame(m_iter.width, m_iter.height, format); + QImage frame; + if (!QImageIOHandler::allocateImage(QSize(m_iter.width, m_iter.height), format, &frame)) + return false; uint8_t *output = frame.bits(); size_t output_size = frame.sizeInBytes(); #if Q_BYTE_ORDER == Q_LITTLE_ENDIAN diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/webp/webp.pro new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/webp/webp.pro --- old/qtimageformats-everywhere-src-6.0.3/src/plugins/imageformats/webp/webp.pro 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/src/plugins/imageformats/webp/webp.pro 1970-01-01 01:00:00.000000000 +0100 @@ -1,18 +0,0 @@ -TARGET = qwebp - -HEADERS += qwebphandler_p.h -SOURCES += main.cpp qwebphandler.cpp -OTHER_FILES += webp.json - -include($$OUT_PWD/../../../imageformats/qtimageformats-config.pri) -QT_FOR_CONFIG += imageformats-private - -qtConfig(system-webp) { - QMAKE_USE += webp -} else { - include($$PWD/../../../3rdparty/libwebp.pri) -} - -PLUGIN_TYPE = imageformats -PLUGIN_CLASS_NAME = QWebpPlugin -load(qt_plugin) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/src/plugins/plugins.pro new/qtimageformats-everywhere-src-6.1.0/src/plugins/plugins.pro --- old/qtimageformats-everywhere-src-6.0.3/src/plugins/plugins.pro 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/src/plugins/plugins.pro 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS = imageformats diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/src/src.pro new/qtimageformats-everywhere-src-6.1.0/src/src.pro --- old/qtimageformats-everywhere-src-6.0.3/src/src.pro 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/src/src.pro 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS = imageformats plugins - -plugins.depends = imageformats diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/tests/.prev_CMakeLists.txt new/qtimageformats-everywhere-src-6.1.0/tests/.prev_CMakeLists.txt --- old/qtimageformats-everywhere-src-6.0.3/tests/.prev_CMakeLists.txt 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/tests/.prev_CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ -# Generated from tests.pro. - -if(QT_BUILD_STANDALONE_TESTS) - # Add qt_find_package calls for extra dependencies that need to be found when building - # the standalone tests here. -endif() -qt_build_tests() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/tests/auto/auto.pro new/qtimageformats-everywhere-src-6.1.0/tests/auto/auto.pro --- old/qtimageformats-everywhere-src-6.0.3/tests/auto/auto.pro 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/tests/auto/auto.pro 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS = \ - tga \ - wbmp \ - dds \ - icns \ - jp2 \ - webp \ - heif \ - mng \ - tiff diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/tests/auto/dds/dds.pro new/qtimageformats-everywhere-src-6.1.0/tests/auto/dds/dds.pro --- old/qtimageformats-everywhere-src-6.0.3/tests/auto/dds/dds.pro 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/tests/auto/dds/dds.pro 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -TARGET = tst_qdds - -QT = core gui testlib -CONFIG -= app_bundle -CONFIG += testcase - -SOURCES += tst_qdds.cpp -RESOURCES += $$PWD/../../shared/images/dds.qrc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/tests/auto/heif/heif.pro new/qtimageformats-everywhere-src-6.1.0/tests/auto/heif/heif.pro --- old/qtimageformats-everywhere-src-6.0.3/tests/auto/heif/heif.pro 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/tests/auto/heif/heif.pro 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -TARGET = tst_qheif - -QT = core gui testlib -CONFIG -= app_bundle -CONFIG += testcase - -SOURCES += tst_qheif.cpp -RESOURCES += $$PWD/../../shared/images/heif.qrc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/tests/auto/icns/icns.pro new/qtimageformats-everywhere-src-6.1.0/tests/auto/icns/icns.pro --- old/qtimageformats-everywhere-src-6.0.3/tests/auto/icns/icns.pro 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/tests/auto/icns/icns.pro 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -TARGET = tst_qicns - -QT = core gui testlib -CONFIG -= app_bundle -CONFIG += testcase - -SOURCES += tst_qicns.cpp -RESOURCES += $$PWD/../../shared/images/icns.qrc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/tests/auto/jp2/jp2.pro new/qtimageformats-everywhere-src-6.1.0/tests/auto/jp2/jp2.pro --- old/qtimageformats-everywhere-src-6.0.3/tests/auto/jp2/jp2.pro 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/tests/auto/jp2/jp2.pro 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -TARGET = tst_qjp2 - -QT = core gui testlib -CONFIG -= app_bundle -CONFIG += testcase - -SOURCES += tst_qjp2.cpp -RESOURCES += $$PWD/../../shared/images/jp2.qrc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/tests/auto/mng/mng.pro new/qtimageformats-everywhere-src-6.1.0/tests/auto/mng/mng.pro --- old/qtimageformats-everywhere-src-6.0.3/tests/auto/mng/mng.pro 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/tests/auto/mng/mng.pro 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -TARGET = tst_qmng - -QT = core gui testlib -CONFIG -= app_bundle -CONFIG += testcase - -SOURCES += tst_qmng.cpp -RESOURCES += $$PWD/../../shared/images/mng.qrc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/tests/auto/tga/tga.pro new/qtimageformats-everywhere-src-6.1.0/tests/auto/tga/tga.pro --- old/qtimageformats-everywhere-src-6.0.3/tests/auto/tga/tga.pro 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/tests/auto/tga/tga.pro 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -TARGET = tst_qtga - -QT = core gui testlib -CONFIG -= app_bundle -CONFIG += testcase - -SOURCES += tst_qtga.cpp -RESOURCES += $$PWD/../../shared/images/tga.qrc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/tests/auto/tiff/tiff.pro new/qtimageformats-everywhere-src-6.1.0/tests/auto/tiff/tiff.pro --- old/qtimageformats-everywhere-src-6.0.3/tests/auto/tiff/tiff.pro 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/tests/auto/tiff/tiff.pro 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -TARGET = tst_qtiff - -QT = core gui testlib -CONFIG -= app_bundle -CONFIG += testcase - -SOURCES += tst_qtiff.cpp -RESOURCES += $$PWD/../../shared/images/tiff.qrc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/tests/auto/wbmp/wbmp.pro new/qtimageformats-everywhere-src-6.1.0/tests/auto/wbmp/wbmp.pro --- old/qtimageformats-everywhere-src-6.0.3/tests/auto/wbmp/wbmp.pro 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/tests/auto/wbmp/wbmp.pro 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -TARGET = tst_qwbmp - -QT = core gui testlib -CONFIG -= app_bundle -CONFIG += testcase - -SOURCES += tst_qwbmp.cpp -RESOURCES += $$PWD/../../shared/images/wbmp.qrc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/tests/auto/webp/webp.pro new/qtimageformats-everywhere-src-6.1.0/tests/auto/webp/webp.pro --- old/qtimageformats-everywhere-src-6.0.3/tests/auto/webp/webp.pro 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/tests/auto/webp/webp.pro 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -TARGET = tst_qwebp - -QT = core gui testlib -CONFIG -= app_bundle -CONFIG += testcase - -SOURCES += tst_qwebp.cpp -RESOURCES += $$PWD/webp.qrc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.0.3/tests/tests.pro new/qtimageformats-everywhere-src-6.1.0/tests/tests.pro --- old/qtimageformats-everywhere-src-6.0.3/tests/tests.pro 2021-03-26 06:53:47.000000000 +0100 +++ new/qtimageformats-everywhere-src-6.1.0/tests/tests.pro 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS = auto benchmarks