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 2023-04-05 21:31:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qt6-imageformats (Old)
and /work/SRC/openSUSE:Factory/.qt6-imageformats.new.19717 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-imageformats"
Wed Apr 5 21:31:50 2023 rev:20 rq:1077326 version:6.5.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/qt6-imageformats/qt6-imageformats.changes
2023-03-17 17:03:46.557527472 +0100
+++
/work/SRC/openSUSE:Factory/.qt6-imageformats.new.19717/qt6-imageformats.changes
2023-04-05 21:36:39.466911848 +0200
@@ -1,0 +2,6 @@
+Mon Apr 3 10:02:07 UTC 2023 - Christophe Marin <christo...@krop.fr>
+
+- Update to 6.5.0
+ * https://www.qt.io/blog/qt-6.5-lts-released
+
+-------------------------------------------------------------------
Old:
----
qtimageformats-everywhere-src-6.4.3.tar.xz
New:
----
qtimageformats-everywhere-src-6.5.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qt6-imageformats.spec ++++++
--- /var/tmp/diff_new_pack.04wys6/_old 2023-04-05 21:36:40.006914931 +0200
+++ /var/tmp/diff_new_pack.04wys6/_new 2023-04-05 21:36:40.010914953 +0200
@@ -1,7 +1,7 @@
#
# spec file for package qt6-imageformats
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,8 +16,8 @@
#
-%define real_version 6.4.3
-%define short_version 6.4
+%define real_version 6.5.0
+%define short_version 6.5
%define short_name qtimageformats
%define tar_name qtimageformats-everywhere-src
%define tar_suffix %{nil}
@@ -28,7 +28,7 @@
%endif
#
Name: qt6-imageformats%{?pkg_suffix}
-Version: 6.4.3
+Version: 6.5.0
Release: 0
Summary: Qt 6 ImageFormat Plugins
License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later)
@@ -37,7 +37,7 @@
Source99: qt6-imageformats-rpmlintrc
BuildRequires: libtiff-devel
BuildRequires: pkgconfig
-BuildRequires: cmake(Qt6Gui)
+BuildRequires: cmake(Qt6Gui) = %{real_version}
BuildRequires: pkgconfig(libmng)
BuildRequires: pkgconfig(libwebp)
%if "%{qt6_flavor}" == "docs"
@@ -54,7 +54,7 @@
Summary: Qt 6 ImageFormats - Development files
Requires: %{name} = %{version}
Requires: libtiff-devel
-Requires: cmake(Qt6Gui)
+Requires: cmake(Qt6Gui) = %{real_version}
Requires: pkgconfig(libmng)
Requires: pkgconfig(libwebp)
++++++ qtimageformats-everywhere-src-6.4.3.tar.xz ->
qtimageformats-everywhere-src-6.5.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtimageformats-everywhere-src-6.4.3/.cmake.conf
new/qtimageformats-everywhere-src-6.5.0/.cmake.conf
--- old/qtimageformats-everywhere-src-6.4.3/.cmake.conf 2023-03-11
19:16:45.000000000 +0100
+++ new/qtimageformats-everywhere-src-6.5.0/.cmake.conf 2023-03-25
20:28:35.000000000 +0100
@@ -1,2 +1,3 @@
-set(QT_REPO_MODULE_VERSION "6.4.3")
+set(QT_REPO_MODULE_VERSION "6.5.0")
set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1")
+set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtimageformats-everywhere-src-6.4.3/.tag
new/qtimageformats-everywhere-src-6.5.0/.tag
--- old/qtimageformats-everywhere-src-6.4.3/.tag 2023-03-11
19:16:45.000000000 +0100
+++ new/qtimageformats-everywhere-src-6.5.0/.tag 2023-03-25
20:28:35.000000000 +0100
@@ -1 +1 @@
-76397817142df0bffccf8d7b4d89932af99258d9
+55bab88828ffcd43e7d380ca84b423bb1339ea75
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtimageformats-everywhere-src-6.4.3/CMakeLists.txt
new/qtimageformats-everywhere-src-6.5.0/CMakeLists.txt
--- old/qtimageformats-everywhere-src-6.4.3/CMakeLists.txt 2023-03-11
19:16:45.000000000 +0100
+++ new/qtimageformats-everywhere-src-6.5.0/CMakeLists.txt 2023-03-25
20:28:35.000000000 +0100
@@ -1,17 +1,18 @@
-# Generated from qtimageformats.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
cmake_minimum_required(VERSION 3.16)
include(.cmake.conf)
-project(QtImageFormats # special case
+project(QtImageFormats
VERSION "${QT_REPO_MODULE_VERSION}"
- DESCRIPTION "Qt ImageFormats Libraries" # special case
+ DESCRIPTION "Qt ImageFormats Libraries"
HOMEPAGE_URL "https://qt.io/";
LANGUAGES CXX C
)
-find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals
Core) # special case
-find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS Gui) #
special case
+find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals
Core)
+find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS Gui)
if(NOT TARGET Qt::Gui)
message(NOTICE "Skipping the build as the condition \"TARGET Qt::Gui\" is
not met.")
return()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-6.4.3/LICENSES/BSD-3-Clause.txt
new/qtimageformats-everywhere-src-6.5.0/LICENSES/BSD-3-Clause.txt
--- old/qtimageformats-everywhere-src-6.4.3/LICENSES/BSD-3-Clause.txt
1970-01-01 01:00:00.000000000 +0100
+++ new/qtimageformats-everywhere-src-6.5.0/LICENSES/BSD-3-Clause.txt
2023-03-25 20:28:35.000000000 +0100
@@ -0,0 +1,9 @@
+Copyright (c) <year> <owner>.
+
+Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived from this
software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-6.4.3/cmake/FindLibmng.cmake
new/qtimageformats-everywhere-src-6.5.0/cmake/FindLibmng.cmake
--- old/qtimageformats-everywhere-src-6.4.3/cmake/FindLibmng.cmake
2023-03-11 19:16:45.000000000 +0100
+++ new/qtimageformats-everywhere-src-6.5.0/cmake/FindLibmng.cmake
2023-03-25 20:28:35.000000000 +0100
@@ -1,3 +1,6 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
if(TARGET Libmng::Libmng)
set(Libmng_FOUND TRUE)
return()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-6.4.3/cmake/FindWrapJasper.cmake
new/qtimageformats-everywhere-src-6.5.0/cmake/FindWrapJasper.cmake
--- old/qtimageformats-everywhere-src-6.4.3/cmake/FindWrapJasper.cmake
2023-03-11 19:16:45.000000000 +0100
+++ new/qtimageformats-everywhere-src-6.5.0/cmake/FindWrapJasper.cmake
2023-03-25 20:28:35.000000000 +0100
@@ -1,3 +1,6 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
# 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)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-6.4.3/cmake/FindWrapWebP.cmake
new/qtimageformats-everywhere-src-6.5.0/cmake/FindWrapWebP.cmake
--- old/qtimageformats-everywhere-src-6.4.3/cmake/FindWrapWebP.cmake
2023-03-11 19:16:45.000000000 +0100
+++ new/qtimageformats-everywhere-src-6.5.0/cmake/FindWrapWebP.cmake
2023-03-25 20:28:35.000000000 +0100
@@ -1,3 +1,6 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
# Latest upstream package provides both CMake and autotools building.
# Unfortunately Linux distros and homebrew build the package with autotools,
# so they do not ship the CMake Config file, but only the pkg-config files.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtimageformats-everywhere-src-6.4.3/configure.cmake
new/qtimageformats-everywhere-src-6.5.0/configure.cmake
--- old/qtimageformats-everywhere-src-6.4.3/configure.cmake 2023-03-11
19:16:45.000000000 +0100
+++ new/qtimageformats-everywhere-src-6.5.0/configure.cmake 2023-03-25
20:28:35.000000000 +0100
@@ -1,3 +1,6 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
#### Inputs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-6.4.3/dependencies.yaml
new/qtimageformats-everywhere-src-6.5.0/dependencies.yaml
--- old/qtimageformats-everywhere-src-6.4.3/dependencies.yaml 2023-03-11
19:16:45.000000000 +0100
+++ new/qtimageformats-everywhere-src-6.5.0/dependencies.yaml 2023-03-25
20:28:35.000000000 +0100
@@ -1,4 +1,4 @@
dependencies:
../qtbase:
- ref: 519d2d8f442409e86a0ee2fa16bd543342180861
+ ref: aea92807be2567c4212b96ae67de7137075ba4ee
required: true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-6.4.3/src/CMakeLists.txt
new/qtimageformats-everywhere-src-6.5.0/src/CMakeLists.txt
--- old/qtimageformats-everywhere-src-6.4.3/src/CMakeLists.txt 2023-03-11
19:16:45.000000000 +0100
+++ new/qtimageformats-everywhere-src-6.5.0/src/CMakeLists.txt 2023-03-25
20:28:35.000000000 +0100
@@ -1,4 +1,5 @@
-# Generated from src.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
add_subdirectory(imageformats)
add_subdirectory(plugins)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-6.4.3/src/imageformats/CMakeLists.txt
new/qtimageformats-everywhere-src-6.5.0/src/imageformats/CMakeLists.txt
--- old/qtimageformats-everywhere-src-6.4.3/src/imageformats/CMakeLists.txt
2023-03-11 19:16:45.000000000 +0100
+++ new/qtimageformats-everywhere-src-6.5.0/src/imageformats/CMakeLists.txt
2023-03-25 20:28:35.000000000 +0100
@@ -1,9 +1,8 @@
-# Generated from imageformats.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
-# special case begin
add_library(ImageFormats INTERFACE)
qt_internal_add_docs(ImageFormats
doc/qtimageformats.qdocconf
)
-# special case end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-6.4.3/src/imageformats/configure.cmake
new/qtimageformats-everywhere-src-6.5.0/src/imageformats/configure.cmake
--- old/qtimageformats-everywhere-src-6.4.3/src/imageformats/configure.cmake
2023-03-11 19:16:45.000000000 +0100
+++ new/qtimageformats-everywhere-src-6.5.0/src/imageformats/configure.cmake
2023-03-25 20:28:35.000000000 +0100
@@ -1,3 +1,6 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
#### Inputs
@@ -16,6 +19,12 @@
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)
+# Threads::Threads might be brought in via a top-level CMakeLists.txt
find_package dependency
+# in which case if the system WebpConfig.cmake depends Threads, it shouldn't
try to promote it to
+# global to avoid a 'global promotion of a target in a different subdirectory'
error.
+if(TARGET Threads::Threads)
+ qt_internal_disable_find_package_global_promotion(Threads::Threads)
+endif()
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)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-6.4.3/src/imageformats/qt_cmdline.cmake
new/qtimageformats-everywhere-src-6.5.0/src/imageformats/qt_cmdline.cmake
--- old/qtimageformats-everywhere-src-6.4.3/src/imageformats/qt_cmdline.cmake
2023-03-11 19:16:45.000000000 +0100
+++ new/qtimageformats-everywhere-src-6.5.0/src/imageformats/qt_cmdline.cmake
2023-03-25 20:28:35.000000000 +0100
@@ -1,3 +1,6 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
qt_commandline_option(jasper TYPE boolean)
qt_commandline_option(mng TYPE boolean)
qt_commandline_option(tiff TYPE enum VALUES no qt system)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-6.4.3/src/plugins/CMakeLists.txt
new/qtimageformats-everywhere-src-6.5.0/src/plugins/CMakeLists.txt
--- old/qtimageformats-everywhere-src-6.4.3/src/plugins/CMakeLists.txt
2023-03-11 19:16:45.000000000 +0100
+++ new/qtimageformats-everywhere-src-6.5.0/src/plugins/CMakeLists.txt
2023-03-25 20:28:35.000000000 +0100
@@ -1,3 +1,4 @@
-# Generated from plugins.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
add_subdirectory(imageformats)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-6.4.3/src/plugins/imageformats/CMakeLists.txt
new/qtimageformats-everywhere-src-6.5.0/src/plugins/imageformats/CMakeLists.txt
---
old/qtimageformats-everywhere-src-6.4.3/src/plugins/imageformats/CMakeLists.txt
2023-03-11 19:16:45.000000000 +0100
+++
new/qtimageformats-everywhere-src-6.5.0/src/plugins/imageformats/CMakeLists.txt
2023-03-25 20:28:35.000000000 +0100
@@ -1,6 +1,6 @@
-# Generated from imageformats.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
-# special case begin
qt_feature_module_begin(
NO_MODULE
PUBLIC_FILE "qtimageformats-config.h"
@@ -8,7 +8,6 @@
)
include(../../imageformats/configure.cmake)
qt_feature_module_end(NO_MODULE)
-# special case end
add_subdirectory(tga)
add_subdirectory(wbmp)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-6.4.3/src/plugins/imageformats/icns/CMakeLists.txt
new/qtimageformats-everywhere-src-6.5.0/src/plugins/imageformats/icns/CMakeLists.txt
---
old/qtimageformats-everywhere-src-6.4.3/src/plugins/imageformats/icns/CMakeLists.txt
2023-03-11 19:16:45.000000000 +0100
+++
new/qtimageformats-everywhere-src-6.5.0/src/plugins/imageformats/icns/CMakeLists.txt
2023-03-25 20:28:35.000000000 +0100
@@ -1,4 +1,5 @@
-# Generated from icns.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
#####################################################################
## QICNSPlugin Plugin:
@@ -17,6 +18,3 @@
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.4.3/src/plugins/imageformats/jp2/CMakeLists.txt
new/qtimageformats-everywhere-src-6.5.0/src/plugins/imageformats/jp2/CMakeLists.txt
---
old/qtimageformats-everywhere-src-6.4.3/src/plugins/imageformats/jp2/CMakeLists.txt
2023-03-11 19:16:45.000000000 +0100
+++
new/qtimageformats-everywhere-src-6.5.0/src/plugins/imageformats/jp2/CMakeLists.txt
2023-03-25 20:28:35.000000000 +0100
@@ -1,4 +1,5 @@
-# Generated from jp2.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
#####################################################################
## QJp2Plugin Plugin:
@@ -15,7 +16,3 @@
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.4.3/src/plugins/imageformats/macheif/CMakeLists.txt
new/qtimageformats-everywhere-src-6.5.0/src/plugins/imageformats/macheif/CMakeLists.txt
---
old/qtimageformats-everywhere-src-6.4.3/src/plugins/imageformats/macheif/CMakeLists.txt
2023-03-11 19:16:45.000000000 +0100
+++
new/qtimageformats-everywhere-src-6.5.0/src/plugins/imageformats/macheif/CMakeLists.txt
2023-03-25 20:28:35.000000000 +0100
@@ -1,14 +1,13 @@
-# Generated from macheif.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
#####################################################################
## QMacHeifPlugin Plugin:
#####################################################################
-# special case begin
find_library(FWCoreFoundation CoreFoundation)
find_library(FWCoreGraphics CoreGraphics)
find_library(FWImageIO ImageIO)
-# special case end
qt_internal_add_plugin(QMacHeifPlugin
OUTPUT_NAME qmacheif
@@ -28,6 +27,3 @@
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.4.3/src/plugins/imageformats/macjp2/CMakeLists.txt
new/qtimageformats-everywhere-src-6.5.0/src/plugins/imageformats/macjp2/CMakeLists.txt
---
old/qtimageformats-everywhere-src-6.4.3/src/plugins/imageformats/macjp2/CMakeLists.txt
2023-03-11 19:16:45.000000000 +0100
+++
new/qtimageformats-everywhere-src-6.5.0/src/plugins/imageformats/macjp2/CMakeLists.txt
2023-03-25 20:28:35.000000000 +0100
@@ -1,4 +1,5 @@
-# Generated from macjp2.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
#####################################################################
## QMacJp2Plugin Plugin:
@@ -22,6 +23,3 @@
Qt::Gui
Qt::GuiPrivate
)
-
-#### Keys ignored in scope 1:.:.:macjp2.pro:<TRUE>:
-# OTHER_FILES = "macjp2.json"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-6.4.3/src/plugins/imageformats/mng/CMakeLists.txt
new/qtimageformats-everywhere-src-6.5.0/src/plugins/imageformats/mng/CMakeLists.txt
---
old/qtimageformats-everywhere-src-6.4.3/src/plugins/imageformats/mng/CMakeLists.txt
2023-03-11 19:16:45.000000000 +0100
+++
new/qtimageformats-everywhere-src-6.5.0/src/plugins/imageformats/mng/CMakeLists.txt
2023-03-25 20:28:35.000000000 +0100
@@ -1,4 +1,5 @@
-# Generated from mng.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
#####################################################################
## QMngPlugin Plugin:
@@ -15,7 +16,3 @@
Qt::Core
Qt::Gui
)
-
-#### Keys ignored in scope 1:.:.:mng.pro:<TRUE>:
-# OTHER_FILES = "mng.json"
-# QT_FOR_CONFIG = "imageformats-private"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-6.4.3/src/plugins/imageformats/tga/CMakeLists.txt
new/qtimageformats-everywhere-src-6.5.0/src/plugins/imageformats/tga/CMakeLists.txt
---
old/qtimageformats-everywhere-src-6.4.3/src/plugins/imageformats/tga/CMakeLists.txt
2023-03-11 19:16:45.000000000 +0100
+++
new/qtimageformats-everywhere-src-6.5.0/src/plugins/imageformats/tga/CMakeLists.txt
2023-03-25 20:28:35.000000000 +0100
@@ -1,4 +1,5 @@
-# Generated from tga.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
#####################################################################
## QTgaPlugin Plugin:
@@ -15,6 +16,3 @@
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.4.3/src/plugins/imageformats/tiff/CMakeLists.txt
new/qtimageformats-everywhere-src-6.5.0/src/plugins/imageformats/tiff/CMakeLists.txt
---
old/qtimageformats-everywhere-src-6.4.3/src/plugins/imageformats/tiff/CMakeLists.txt
2023-03-11 19:16:45.000000000 +0100
+++
new/qtimageformats-everywhere-src-6.5.0/src/plugins/imageformats/tiff/CMakeLists.txt
2023-03-25 20:28:35.000000000 +0100
@@ -1,17 +1,16 @@
-# Generated from tiff.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
#####################################################################
## QTiffPlugin Plugin:
#####################################################################
-# special case begin
# Handle the conditional finding of either system zlib or qt zlib.
if(NOT QT_FEATURE_system_zlib)
find_package(Qt6 COMPONENTS ZlibPrivate)
elseif(NOT TARGET WrapZLIB::WrapZLIB)
qt_find_package(WrapZLIB PROVIDED_TARGETS WrapZLIB::WrapZLIB)
endif()
-# special case end
qt_internal_add_plugin(QTiffPlugin
OUTPUT_NAME qtiff
@@ -24,9 +23,7 @@
Qt::Gui
)
-#### Keys ignored in scope 1:.:.:tiff.pro:<TRUE>:
-# OTHER_FILES = "tiff.json"
-# QT_FOR_CONFIG = "imageformats-private"
+set_target_properties(QTiffPlugin PROPERTIES UNITY_BUILD OFF)
## Scopes:
#####################################################################
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-6.4.3/src/plugins/imageformats/tiff/qtiffhandler.cpp
new/qtimageformats-everywhere-src-6.5.0/src/plugins/imageformats/tiff/qtiffhandler.cpp
---
old/qtimageformats-everywhere-src-6.4.3/src/plugins/imageformats/tiff/qtiffhandler.cpp
2023-03-11 19:16:45.000000000 +0100
+++
new/qtimageformats-everywhere-src-6.5.0/src/plugins/imageformats/tiff/qtiffhandler.cpp
2023-03-25 20:28:35.000000000 +0100
@@ -982,7 +982,7 @@
uchar *scanline = image->bits();
const qsizetype bpl = image->bytesPerLine();
quint16 mask = 0xffff;
- const qfloat16 fp_mask = 1.0f;
+ const qfloat16 fp_mask = qfloat16(1.0f);
if (floatingPoint)
memcpy(&mask, &fp_mask, 2);
for (int y = 0; y < h; ++y) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-6.4.3/src/plugins/imageformats/wbmp/CMakeLists.txt
new/qtimageformats-everywhere-src-6.5.0/src/plugins/imageformats/wbmp/CMakeLists.txt
---
old/qtimageformats-everywhere-src-6.4.3/src/plugins/imageformats/wbmp/CMakeLists.txt
2023-03-11 19:16:45.000000000 +0100
+++
new/qtimageformats-everywhere-src-6.5.0/src/plugins/imageformats/wbmp/CMakeLists.txt
2023-03-25 20:28:35.000000000 +0100
@@ -1,4 +1,5 @@
-# Generated from wbmp.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
#####################################################################
## QWbmpPlugin Plugin:
@@ -14,6 +15,3 @@
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.4.3/src/plugins/imageformats/webp/CMakeLists.txt
new/qtimageformats-everywhere-src-6.5.0/src/plugins/imageformats/webp/CMakeLists.txt
---
old/qtimageformats-everywhere-src-6.4.3/src/plugins/imageformats/webp/CMakeLists.txt
2023-03-11 19:16:45.000000000 +0100
+++
new/qtimageformats-everywhere-src-6.5.0/src/plugins/imageformats/webp/CMakeLists.txt
2023-03-25 20:28:35.000000000 +0100
@@ -1,4 +1,5 @@
-# Generated from webp.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
#####################################################################
## QWebpPlugin Plugin:
@@ -15,9 +16,7 @@
Qt::Gui
)
-#### Keys ignored in scope 1:.:.:webp.pro:<TRUE>:
-# OTHER_FILES = "webp.json"
-# QT_FOR_CONFIG = "imageformats-private"
+set_target_properties(QWebpPlugin PROPERTIES UNITY_BUILD OFF)
## Scopes:
#####################################################################
@@ -154,12 +153,11 @@
qt_internal_extend_target(QWebpPlugin CONDITION ANDROID AND NOT
ANDROID_EMBEDDED AND NOT QT_FEATURE_system_webp
SOURCES
- ${CMAKE_ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c #
special case
+ ${CMAKE_ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c
INCLUDE_DIRECTORIES
- ${CMAKE_ANDROID_NDK}/sources/android/cpufeatures #
special case
+ ${CMAKE_ANDROID_NDK}/sources/android/cpufeatures
)
-# special case begin
set(neon_sources
../../../3rdparty/libwebp/sharpyuv/sharpyuv_neon.c
../../../3rdparty/libwebp/src/dsp/alpha_processing_neon.c
@@ -184,25 +182,3 @@
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:
-# 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.4.3/src/plugins/imageformats/webp/qwebphandler.cpp
new/qtimageformats-everywhere-src-6.5.0/src/plugins/imageformats/webp/qwebphandler.cpp
---
old/qtimageformats-everywhere-src-6.4.3/src/plugins/imageformats/webp/qwebphandler.cpp
2023-03-11 19:16:45.000000000 +0100
+++
new/qtimageformats-everywhere-src-6.5.0/src/plugins/imageformats/webp/qwebphandler.cpp
2023-03-25 20:28:35.000000000 +0100
@@ -9,6 +9,7 @@
#include <qdebug.h>
#include <qpainter.h>
#include <qvariant.h>
+#include <QtEndian>
static const int riffHeaderSize = 12; // RIFF_HEADER_SIZE from
webp/format_constants.h
@@ -66,21 +67,23 @@
m_scanState = ScanError;
- if (device()->isSequential()) {
- qWarning() << "Sequential devices are not supported";
+ QWebpHandler *that = const_cast<QWebpHandler *>(this);
+ const int headerBytesNeeded = sizeof(WebPBitstreamFeatures);
+ QByteArray header = device()->peek(headerBytesNeeded);
+ if (header.size() < headerBytesNeeded)
return false;
- }
- qint64 oldPos = device()->pos();
- device()->seek(0);
-
- QWebpHandler *that = const_cast<QWebpHandler *>(this);
- QByteArray header = device()->peek(sizeof(WebPBitstreamFeatures));
+ // We do no random access during decoding, just a readAll() of the whole
image file. So if
+ // if it is all available already, we can accept a sequential device. The
riff header contains
+ // the file size minus 8 bytes header
+ qint64 byteSize = qFromLittleEndian<quint32>(header.constData() + 4);
+ if (device()->isSequential() && device()->bytesAvailable() < byteSize + 8)
{
+ qWarning() << "QWebpHandler: Insufficient data available in sequential
device";
+ return false;
+ }
if (WebPGetFeatures((const uint8_t*)header.constData(), header.size(),
&(that->m_features)) == VP8_STATUS_OK) {
if (m_features.has_animation) {
// For animation, we have to read and scan whole file to determine
loop count and images count
- device()->seek(oldPos);
-
if (that->ensureDemuxer()) {
that->m_loop = WebPDemuxGetI(m_demuxer, WEBP_FF_LOOP_COUNT);
that->m_frameCount = WebPDemuxGetI(m_demuxer,
WEBP_FF_FRAME_COUNT);
@@ -93,17 +96,13 @@
if (that->m_features.has_alpha)
that->m_composited->fill(Qt::transparent);
- // We do not reset device position since we have read in all
data
m_scanState = ScanSuccess;
- return true;
}
} else {
m_scanState = ScanSuccess;
}
}
- device()->seek(oldPos);
-
return m_scanState == ScanSuccess;
}
@@ -126,7 +125,7 @@
bool QWebpHandler::read(QImage *image)
{
- if (!ensureScanned() || device()->isSequential() || !ensureDemuxer())
+ if (!ensureScanned() || !ensureDemuxer())
return false;
QRect prevFrameRect;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-6.4.3/tests/CMakeLists.txt
new/qtimageformats-everywhere-src-6.5.0/tests/CMakeLists.txt
--- old/qtimageformats-everywhere-src-6.4.3/tests/CMakeLists.txt
2023-03-11 19:16:45.000000000 +0100
+++ new/qtimageformats-everywhere-src-6.5.0/tests/CMakeLists.txt
2023-03-25 20:28:35.000000000 +0100
@@ -1,4 +1,5 @@
-# Generated from tests.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
if(QT_BUILD_STANDALONE_TESTS)
# Add qt_find_package calls for extra dependencies that need to be found
when building
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-6.4.3/tests/auto/CMakeLists.txt
new/qtimageformats-everywhere-src-6.5.0/tests/auto/CMakeLists.txt
--- old/qtimageformats-everywhere-src-6.4.3/tests/auto/CMakeLists.txt
2023-03-11 19:16:45.000000000 +0100
+++ new/qtimageformats-everywhere-src-6.5.0/tests/auto/CMakeLists.txt
2023-03-25 20:28:35.000000000 +0100
@@ -1,3 +1,5 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
# For now, don't built auto tests when QT_BUILD_MINIMAL_STATIC_TEST
# is specified and the build is targeting iOS. QT_BUILD_MINIMAL_STATIC_TEST is
used in our CI.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-6.4.3/tests/auto/dds/CMakeLists.txt
new/qtimageformats-everywhere-src-6.5.0/tests/auto/dds/CMakeLists.txt
--- old/qtimageformats-everywhere-src-6.4.3/tests/auto/dds/CMakeLists.txt
2023-03-11 19:16:45.000000000 +0100
+++ new/qtimageformats-everywhere-src-6.5.0/tests/auto/dds/CMakeLists.txt
2023-03-25 20:28:35.000000000 +0100
@@ -1,4 +1,5 @@
-# Generated from dds.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
#####################################################################
## tst_qdds Test:
@@ -7,7 +8,7 @@
qt_internal_add_test(tst_qdds
SOURCES
tst_qdds.cpp
- PUBLIC_LIBRARIES
+ LIBRARIES
Qt::Gui
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-6.4.3/tests/auto/heif/CMakeLists.txt
new/qtimageformats-everywhere-src-6.5.0/tests/auto/heif/CMakeLists.txt
--- old/qtimageformats-everywhere-src-6.4.3/tests/auto/heif/CMakeLists.txt
2023-03-11 19:16:45.000000000 +0100
+++ new/qtimageformats-everywhere-src-6.5.0/tests/auto/heif/CMakeLists.txt
2023-03-25 20:28:35.000000000 +0100
@@ -1,4 +1,5 @@
-# Generated from heif.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
#####################################################################
## tst_qheif Test:
@@ -7,7 +8,7 @@
qt_internal_add_test(tst_qheif
SOURCES
tst_qheif.cpp
- PUBLIC_LIBRARIES
+ LIBRARIES
Qt::Gui
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-6.4.3/tests/auto/icns/CMakeLists.txt
new/qtimageformats-everywhere-src-6.5.0/tests/auto/icns/CMakeLists.txt
--- old/qtimageformats-everywhere-src-6.4.3/tests/auto/icns/CMakeLists.txt
2023-03-11 19:16:45.000000000 +0100
+++ new/qtimageformats-everywhere-src-6.5.0/tests/auto/icns/CMakeLists.txt
2023-03-25 20:28:35.000000000 +0100
@@ -1,4 +1,6 @@
-# Generated from icns.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
#####################################################################
## tst_qicns Test:
@@ -7,7 +9,7 @@
qt_internal_add_test(tst_qicns
SOURCES
tst_qicns.cpp
- PUBLIC_LIBRARIES
+ LIBRARIES
Qt::Gui
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-6.4.3/tests/auto/jp2/CMakeLists.txt
new/qtimageformats-everywhere-src-6.5.0/tests/auto/jp2/CMakeLists.txt
--- old/qtimageformats-everywhere-src-6.4.3/tests/auto/jp2/CMakeLists.txt
2023-03-11 19:16:45.000000000 +0100
+++ new/qtimageformats-everywhere-src-6.5.0/tests/auto/jp2/CMakeLists.txt
2023-03-25 20:28:35.000000000 +0100
@@ -1,4 +1,5 @@
-# Generated from jp2.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
#####################################################################
## tst_qjp2 Test:
@@ -7,7 +8,7 @@
qt_internal_add_test(tst_qjp2
SOURCES
tst_qjp2.cpp
- PUBLIC_LIBRARIES
+ LIBRARIES
Qt::Gui
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-6.4.3/tests/auto/mng/CMakeLists.txt
new/qtimageformats-everywhere-src-6.5.0/tests/auto/mng/CMakeLists.txt
--- old/qtimageformats-everywhere-src-6.4.3/tests/auto/mng/CMakeLists.txt
2023-03-11 19:16:45.000000000 +0100
+++ new/qtimageformats-everywhere-src-6.5.0/tests/auto/mng/CMakeLists.txt
2023-03-25 20:28:35.000000000 +0100
@@ -1,4 +1,5 @@
-# Generated from mng.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
#####################################################################
## tst_qmng Test:
@@ -7,7 +8,7 @@
qt_internal_add_test(tst_qmng
SOURCES
tst_qmng.cpp
- PUBLIC_LIBRARIES
+ LIBRARIES
Qt::Gui
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-6.4.3/tests/auto/tga/CMakeLists.txt
new/qtimageformats-everywhere-src-6.5.0/tests/auto/tga/CMakeLists.txt
--- old/qtimageformats-everywhere-src-6.4.3/tests/auto/tga/CMakeLists.txt
2023-03-11 19:16:45.000000000 +0100
+++ new/qtimageformats-everywhere-src-6.5.0/tests/auto/tga/CMakeLists.txt
2023-03-25 20:28:35.000000000 +0100
@@ -1,4 +1,5 @@
-# Generated from tga.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
#####################################################################
## tst_qtga Test:
@@ -7,7 +8,7 @@
qt_internal_add_test(tst_qtga
SOURCES
tst_qtga.cpp
- PUBLIC_LIBRARIES
+ LIBRARIES
Qt::Gui
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-6.4.3/tests/auto/tiff/CMakeLists.txt
new/qtimageformats-everywhere-src-6.5.0/tests/auto/tiff/CMakeLists.txt
--- old/qtimageformats-everywhere-src-6.4.3/tests/auto/tiff/CMakeLists.txt
2023-03-11 19:16:45.000000000 +0100
+++ new/qtimageformats-everywhere-src-6.5.0/tests/auto/tiff/CMakeLists.txt
2023-03-25 20:28:35.000000000 +0100
@@ -1,4 +1,6 @@
-# Generated from tiff.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
#####################################################################
## tst_qtiff Test:
@@ -7,7 +9,7 @@
qt_internal_add_test(tst_qtiff
SOURCES
tst_qtiff.cpp
- PUBLIC_LIBRARIES
+ LIBRARIES
Qt::Gui
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-6.4.3/tests/auto/wbmp/CMakeLists.txt
new/qtimageformats-everywhere-src-6.5.0/tests/auto/wbmp/CMakeLists.txt
--- old/qtimageformats-everywhere-src-6.4.3/tests/auto/wbmp/CMakeLists.txt
2023-03-11 19:16:45.000000000 +0100
+++ new/qtimageformats-everywhere-src-6.5.0/tests/auto/wbmp/CMakeLists.txt
2023-03-25 20:28:35.000000000 +0100
@@ -1,4 +1,5 @@
-# Generated from wbmp.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
#####################################################################
## tst_qwbmp Test:
@@ -7,7 +8,7 @@
qt_internal_add_test(tst_qwbmp
SOURCES
tst_qwbmp.cpp
- PUBLIC_LIBRARIES
+ LIBRARIES
Qt::Gui
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-6.4.3/tests/auto/webp/CMakeLists.txt
new/qtimageformats-everywhere-src-6.5.0/tests/auto/webp/CMakeLists.txt
--- old/qtimageformats-everywhere-src-6.4.3/tests/auto/webp/CMakeLists.txt
2023-03-11 19:16:45.000000000 +0100
+++ new/qtimageformats-everywhere-src-6.5.0/tests/auto/webp/CMakeLists.txt
2023-03-25 20:28:35.000000000 +0100
@@ -1,4 +1,5 @@
-# Generated from webp.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
#####################################################################
## tst_qwebp Test:
@@ -7,7 +8,7 @@
qt_internal_add_test(tst_qwebp
SOURCES
tst_qwebp.cpp
- PUBLIC_LIBRARIES
+ LIBRARIES
Qt::Gui
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-6.4.3/tests/benchmarks/CMakeLists.txt
new/qtimageformats-everywhere-src-6.5.0/tests/benchmarks/CMakeLists.txt
--- old/qtimageformats-everywhere-src-6.4.3/tests/benchmarks/CMakeLists.txt
2023-03-11 19:16:45.000000000 +0100
+++ new/qtimageformats-everywhere-src-6.5.0/tests/benchmarks/CMakeLists.txt
2023-03-25 20:28:35.000000000 +0100
@@ -1,4 +1,6 @@
-# Generated from benchmarks.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
if(QT_FEATURE_system_zlib)
add_subdirectory(mng)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-6.4.3/tests/benchmarks/mng/CMakeLists.txt
new/qtimageformats-everywhere-src-6.5.0/tests/benchmarks/mng/CMakeLists.txt
--- old/qtimageformats-everywhere-src-6.4.3/tests/benchmarks/mng/CMakeLists.txt
2023-03-11 19:16:45.000000000 +0100
+++ new/qtimageformats-everywhere-src-6.5.0/tests/benchmarks/mng/CMakeLists.txt
2023-03-25 20:28:35.000000000 +0100
@@ -1,4 +1,5 @@
-# Generated from mng.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
#####################################################################
## tst_bench_qmng Binary:
@@ -7,7 +8,7 @@
qt_internal_add_benchmark(tst_bench_qmng
SOURCES
tst_qmng.cpp
- PUBLIC_LIBRARIES
+ LIBRARIES
Qt::Gui
Qt::Test
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-6.4.3/tests/benchmarks/tiff/CMakeLists.txt
new/qtimageformats-everywhere-src-6.5.0/tests/benchmarks/tiff/CMakeLists.txt
---
old/qtimageformats-everywhere-src-6.4.3/tests/benchmarks/tiff/CMakeLists.txt
2023-03-11 19:16:45.000000000 +0100
+++
new/qtimageformats-everywhere-src-6.5.0/tests/benchmarks/tiff/CMakeLists.txt
2023-03-25 20:28:35.000000000 +0100
@@ -1,4 +1,5 @@
-# Generated from tiff.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
#####################################################################
## tst_bench_qtiff Binary:
@@ -7,7 +8,7 @@
qt_internal_add_benchmark(tst_bench_qtiff
SOURCES
tst_qtiff.cpp
- PUBLIC_LIBRARIES
+ LIBRARIES
Qt::Gui
Qt::Test
)
