GIT_SILENT Upgrade ECM and KF5 version requirements for 5.68.0 release.

GIT_SILENT: qtcreator created .cmake/ repo.
GIT_SILENT increase KF_DISABLE_DEPRECATED_BEFORE_AND_AT
2025-07-16 03:24:17 -04:00 · 2020-03-07 08:52:35 +00:00 · 2020-02-12 07:12:24 +01:00 · 2020-02-09 20:26:37 +01:00 · 2020-02-01 09:04:07 +00:00 · 2020-01-12 12:46:21 +01:00
4 changed files with 10 additions and 7 deletions
--- a/.gitignore
+++ b/.gitignore
@ -19,3 +19,4 @@ random_seed
 /build*/
 CMakeLists.txt.user*
 *.unc-backup*
+.cmake/
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 3.5)
 project(KImageFormats)

 include(FeatureSummary)
-find_package(ECM 5.63.0  NO_MODULE)
-set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules")
+find_package(ECM 5.68.0  NO_MODULE)
+set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules")
 feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES)


@ -17,7 +17,7 @@ include(KDECMakeSettings)

 include(CheckIncludeFiles)

-set(REQUIRED_QT_VERSION 5.11.0)
+set(REQUIRED_QT_VERSION 5.12.0)
 find_package(Qt5Gui ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE)

 find_package(KF5Archive)
@ -46,6 +46,10 @@ set_package_properties(OpenEXR PROPERTIES
    PURPOSE "Required for the QImage plugin for OpenEXR images"
 )
 add_definitions(-DQT_NO_FOREACH)
+# 050d00 (5.13) triggers a BIC in qimageiohandler.h, in Qt 5.13, so do not enable that until we can require 5.14
+# https://codereview.qt-project.org/c/qt/qtbase/+/279215
+add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050c00)
+add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054300)
 add_subdirectory(src)
 if (BUILD_TESTING)
    add_subdirectory(autotests)
--- a/src/imageformats/pic.cpp
+++ b/src/imageformats/pic.cpp
@ -130,9 +130,7 @@ static QDataStream &operator>> (QDataStream &s, QList<PicChannel> &channels)
        PicChannel channel;
        s >> chained;
        s >> channel.size;
-        quint8 encoding;
-        s >> encoding;
-        channel.encoding = PicChannelEncoding(encoding);
+        s >> channel.encoding;
        s >> channel.code;
        channels << channel;
        ++count;
--- a/src/imageformats/pic_p.h
+++ b/src/imageformats/pic_p.h
@ -119,7 +119,7 @@ struct PicHeader {
 */
 struct PicChannel {
    quint8 size; /**< Bits per component per pixel. */
-    PicChannelEncoding encoding; /**< How the channel's data is encoded. */
+    quint8 encoding; /**< How the channel's data is encoded. */
    quint8 code; /**< Flag field to describe which components are encoded in
                      this channel. */
Author	SHA1	Message	Date
l10n daemon script	203f459536	GIT_SILENT Upgrade ECM and KF5 version requirements for 5.68.0 release.	2020-03-07 08:52:35 +00:00
Laurent Montel	693bb34b69	GIT_SILENT: qtcreator created .cmake/ repo.	2020-02-12 07:12:24 +01:00
David Faure	5c66570b9e	GIT_SILENT increase KF_DISABLE_DEPRECATED_BEFORE_AND_AT	2020-02-09 20:26:37 +01:00
l10n daemon script	cba2328ae6	GIT_SILENT Upgrade ECM and KF5 version requirements for 5.67.0 release.	2020-02-01 09:04:07 +00:00
David Faure	961465a311	GIT_SILENT Bump KF5 deprecation level to 5.66	2020-01-12 12:46:21 +01:00
l10n daemon script	b7cd5cddc1	GIT_SILENT Upgrade ECM and KF5 version requirements for 5.66.0 release.	2020-01-03 23:12:09 +00:00
Albert Astals Cid	ce56b97ee7	GIT_SILENT Upgrade Qt5 version requirement to 5.12.0.	2019-12-21 12:34:54 +01:00
Luigi Toscano	500ce13265	Update the obsolete projects.kde.org URL Use the generic redirect commits.kde.org. Change discussed on the kde-frameworks-devel list: https://mail.kde.org/pipermail/kde-frameworks-devel/2019-November/097564.html	2019-12-15 22:42:38 +01:00
Albert Astals Cid	f03739f222	pic: Fix Invalid-enum-value undefined behaviour Summary: Instead of directly casting the quint8 to PicChannelEncoding we just store the quint8 and compare it to the possible PicChannelEncoding values when needed oss-fuzz/19344 Reviewers: dfaure Reviewed By: dfaure Subscribers: dfaure, security-team, kde-frameworks-devel Tags: #frameworks Differential Revision: https://phabricator.kde.org/D25937	2019-12-14 21:05:02 +01:00
David Faure	69effbf9f5	GIT_SILENT Bump KF5 deprecation level to 5.65	2019-12-14 12:22:02 +01:00
David Faure	f06cf300f1	GIT_SILENT Bump KF5 deprecation level to 5.64	2019-12-14 11:45:23 +01:00
l10n daemon script	2a4d230717	GIT_SILENT Upgrade ECM and KF5 version requirements for 5.65.0 release.	2019-12-07 19:43:41 +00:00
David Faure	bdf23e45d5	GIT_SILENT QT_DEPRECATED_WARNINGS_SINCE will be done by ECM	2019-11-03 21:13:00 +01:00
l10n daemon script	e9b52df1d3	GIT_SILENT Upgrade ECM and KF5 version requirements for 5.64.0 release.	2019-11-02 11:44:38 +00:00
David Faure	dd98b2b717	Workaround crash in Qt due to -DQT_DISABLE_DEPRECATED_BEFORE=0x050d00 https://codereview.qt-project.org/c/qt/qtbase/+/279215 NO_CHANGELOG	2019-10-27 09:38:43 +01:00
David Faure	dd76f41c38	GIT_SILENT disable use of deprecated KF5 API	2019-10-26 23:20:53 +02:00
David Faure	940ca2b081	GIT_SILENT enable Qt deprecation warnings	2019-10-25 00:28:24 +02:00