Upgrade ECM and KF5 version requirements for 5.28.0 release.

imageformats/kra.h - overrides for KraPlugin capabilities() and create()
Upgrade ECM and KF5 version requirements for 5.27.0 release.
2025-07-16 03:24:17 -04:00 · 2016-11-05 11:02:19 +00:00 · 2016-10-16 11:50:18 -04:00 · 2016-10-02 08:00:57 +00:00 · 2016-09-23 00:51:41 +02:00 · 2016-09-05 22:36:08 +00:00
5 changed files with 11 additions and 15 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12)
 project(KImageFormats)

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

@ -11,13 +11,13 @@ feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKA
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})

 include(KDEInstallDirs)
-include(KDEFrameworkCompilerSettings)
+include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
 include(KDECMakeSettings)


 include(CheckIncludeFiles)

-set(REQUIRED_QT_VERSION 5.4.0)
+set(REQUIRED_QT_VERSION 5.5.0)
 find_package(Qt5Gui ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE)

 find_package(KF5Archive)
--- a/metainfo.yaml
+++ b/metainfo.yaml
@ -7,6 +7,7 @@ platforms:
    - name: MacOSX
    - name: Windows
      note: No EPS support on Windows
+    - name: Android
 portingAid: false
 deprecated: false
 release: true
--- a/src/imageformats/eps.cpp
+++ b/src/imageformats/eps.cpp
@ -15,12 +15,8 @@
 #include <QProcess>
 #include <QTemporaryFile>

-#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
 // logging category for this framework, default: log stuff >= warning
 Q_LOGGING_CATEGORY(EPSPLUGIN, "epsplugin", QtWarningMsg)
-#else
-Q_LOGGING_CATEGORY(EPSPLUGIN, "epsplugin")
-#endif

 //#define EPS_PERFORMANCE_DEBUG 1

--- a/src/imageformats/kra.h
+++ b/src/imageformats/kra.h
@ -29,11 +29,10 @@ class KraPlugin : public QImageIOPlugin
    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "kra.json")

 public:
-    Capabilities capabilities(QIODevice *device, const QByteArray &format) const;
-    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const;
+    Capabilities capabilities(QIODevice *device, const QByteArray &format) const Q_DECL_OVERRIDE;
+    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const Q_DECL_OVERRIDE;
 };



 #endif
-
--- a/src/imageformats/psd.cpp
+++ b/src/imageformats/psd.cpp
@ -120,19 +120,19 @@ static quint8 readPixel(QDataStream &stream) {
    quint8 pixel;
    stream >> pixel;
    return pixel;
-};
+}
 static QRgb updateRed(QRgb oldPixel, quint8 redPixel) {
    return qRgba(redPixel, qGreen(oldPixel), qBlue(oldPixel), qAlpha(oldPixel));
-};
+}
 static QRgb updateGreen(QRgb oldPixel, quint8 greenPixel) {
    return qRgba(qRed(oldPixel), greenPixel, qBlue(oldPixel), qAlpha(oldPixel));
-};
+}
 static QRgb updateBlue(QRgb oldPixel, quint8 bluePixel) {
    return qRgba(qRed(oldPixel), qGreen(oldPixel), bluePixel, qAlpha(oldPixel));
-};
+}
 static QRgb updateAlpha(QRgb oldPixel, quint8 alphaPixel) {
    return qRgba(qRed(oldPixel), qGreen(oldPixel), qBlue(oldPixel), alphaPixel);
-};
+}
 typedef QRgb(*channelUpdater)(QRgb,quint8);

 // Load the PSD image.
Author	SHA1	Message	Date
l10n daemon script	1fca298a20	Upgrade ECM and KF5 version requirements for 5.28.0 release.	2016-11-05 11:02:19 +00:00
Allen Winter	09b1ac5a16	imageformats/kra.h - overrides for KraPlugin capabilities() and create()	2016-10-16 11:50:18 -04:00
l10n daemon script	7f852d241a	Upgrade ECM and KF5 version requirements for 5.27.0 release.	2016-10-02 08:00:57 +00:00
Heiko Becker	5fdcdff6e3	Drop obsolete version check Frameworks already require Qt 5.5.0. REVIEW: 128989	2016-09-23 00:51:41 +02:00
l10n daemon script	60b5866b77	Upgrade ECM and KF5 version requirements for 5.26.0 release.	2016-09-05 22:36:08 +00:00
l10n daemon script	f42c1b7423	Upgrade ECM and KF5 version requirements for 5.25.0 release.	2016-08-06 08:34:21 +00:00
l10n daemon script	ede3a4a3f3	Qt 5.5.0 is now required, as discussed on kde-frameworks-devel	2016-07-24 13:20:33 +00:00
l10n daemon script	1d2aed54fa	Upgrade ECM and KF5 version requirements for 5.24.0 release.	2016-07-02 08:48:36 +00:00
Andreas Cord-Landwehr	b019a2a57e	Promote Android support	2016-06-18 00:04:19 +02:00
Heiko Becker	a4de98aa4f	Silence CMake policy CMP0063 warning ...by adding the NO_POLICY_SCOPE flag as recommended by ECM's documentation. REVIEW: 128139	2016-06-09 17:57:09 +02:00
Pino Toscano	172c494cff	remove extra ';'	2016-06-09 10:57:48 +02:00