Upgrade ECM and KF5 version requirements for 5.16.0 release.

Recognize image/vnd.adobe.photoshop instead of image/x-psd
REVIEW: 125790
2025-07-14 19:04:17 -04:00 · 2015-11-08 11:08:43 +00:00 · 2015-11-07 13:27:42 +01:00 · 2015-11-04 23:51:53 +01:00 · 2015-11-02 21:57:43 +01:00 · 2015-10-03 10:22:35 +00:00
6 changed files with 19 additions and 19 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.14.0  NO_MODULE)
+find_package(ECM 5.16.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)

--- a/autotests/readtest.cpp
+++ b/autotests/readtest.cpp
@ -129,7 +129,7 @@ int main(int argc, char ** argv)
    foreach (QFileInfo fi, imgdir.entryInfoList()) {
        int suffixPos = fi.filePath().count() - suffix.count();
        QString inputfile = fi.filePath();
-        QString expfile = fi.filePath().replace(suffixPos, suffix.count(), "png");
+        QString expfile = fi.filePath().replace(suffixPos, suffix.count(), QStringLiteral("png"));
        QString expfilename = QFileInfo(expfile).fileName();

        QImageReader inputReader(inputfile, format.constData());
--- a/autotests/writetest.cpp
+++ b/autotests/writetest.cpp
@ -75,7 +75,7 @@ int main(int argc, char ** argv)

    foreach (QFileInfo fi, imgdir.entryInfoList()) {
        int suffixPos = fi.filePath().count() - suffix.count();
-        QString pngfile = fi.filePath().replace(suffixPos, suffix.count(), "png");
+        QString pngfile = fi.filePath().replace(suffixPos, suffix.count(), QStringLiteral("png"));
        QString pngfilename = QFileInfo(pngfile).fileName();

        QImageReader pngReader(pngfile, "png");
--- a/src/imageformats/psd.desktop
+++ b/src/imageformats/psd.desktop
@ -2,6 +2,6 @@
 Type=Service
 X-KDE-ServiceTypes=QImageIOPlugins
 X-KDE-ImageFormat=psd
-X-KDE-MimeType=image/x-psd
+X-KDE-MimeType=image/vnd.adobe.photoshop
 X-KDE-Read=true
 X-KDE-Write=false
--- a/src/imageformats/psd.json
+++ b/src/imageformats/psd.json
@ -1,4 +1,4 @@
 {
    "Keys": [ "psd" ],
-    "MimeTypes": [ "image/x-psd" ]
+    "MimeTypes": [ "image/vnd.adobe.photoshop" ]
 }
--- a/tests/imageconverter.cpp
+++ b/tests/imageconverter.cpp
@ -32,29 +32,29 @@
 int main(int argc, char **argv)
 {
    QCoreApplication app(argc, argv);
-    QCoreApplication::addLibraryPath(QLatin1String(PLUGIN_DIR));
-    QCoreApplication::setApplicationName(QLatin1String("imageconverter"));
-    QCoreApplication::setApplicationVersion(QLatin1String("1.01.01.0"));
+    QCoreApplication::addLibraryPath(QStringLiteral(PLUGIN_DIR));
+    QCoreApplication::setApplicationName(QStringLiteral("imageconverter"));
+    QCoreApplication::setApplicationVersion(QStringLiteral("1.01.01.0"));

    QCommandLineParser parser;
-    parser.setApplicationDescription(QLatin1String("Converts images from one format to another"));
+    parser.setApplicationDescription(QStringLiteral("Converts images from one format to another"));
    parser.addHelpOption();
    parser.addVersionOption();
-    parser.addPositionalArgument(QLatin1String("in"), QLatin1String("input image file"));
-    parser.addPositionalArgument(QLatin1String("out"), QLatin1String("output image file"));
+    parser.addPositionalArgument(QStringLiteral("in"), QStringLiteral("input image file"));
+    parser.addPositionalArgument(QStringLiteral("out"), QStringLiteral("output image file"));
    QCommandLineOption informat(
-        QStringList() << QLatin1String("i") << QLatin1String("informat"),
-        QLatin1String("Image format for input file"),
-        QLatin1String("format"));
+        QStringList() << QStringLiteral("i") << QStringLiteral("informat"),
+        QStringLiteral("Image format for input file"),
+        QStringLiteral("format"));
    parser.addOption(informat);
    QCommandLineOption outformat(
-        QStringList() << QLatin1String("o") << QLatin1String("outformat"),
-        QLatin1String("Image format for output file"),
-        QLatin1String("format"));
+        QStringList() << QStringLiteral("o") << QStringLiteral("outformat"),
+        QStringLiteral("Image format for output file"),
+        QStringLiteral("format"));
    parser.addOption(outformat);
    QCommandLineOption listformats(
-        QStringList() << QLatin1String("l") << QLatin1String("list"),
-        QLatin1String("List supported image formats"));
+        QStringList() << QStringLiteral("l") << QStringLiteral("list"),
+        QStringLiteral("List supported image formats"));
    parser.addOption(listformats);

    parser.process(app);
Author	SHA1	Message	Date
l10n daemon script	cc219211bb	Upgrade ECM and KF5 version requirements for 5.16.0 release.	2015-11-08 11:08:43 +00:00
Kai Uwe Broulik	f2adcb81d1	Recognize image/vnd.adobe.photoshop instead of image/x-psd REVIEW: 125790	2015-11-07 13:27:42 +01:00
Luca Beltrame	814c7a2b30	Partially revert `d7f457a` to prevent crash on application exit The change to QLatin1String to QStringLiteral had a very nasty unintended side effect, causing many (but not all) applications to crash on exit. Laurent, please be wary with blanket changes on low level code as they might break things in unexpected ways. CCMAIL: montel@kde.org CCMAIL: tittiatcoke@gmail.com	2015-11-04 23:51:53 +01:00
Montel Laurent	d7f457a124	Use QStringLiteral	2015-11-02 21:57:43 +01:00
l10n daemon script	69c4a4b84a	Upgrade ECM and KF5 version requirements for 5.15.0 release.	2015-10-03 10:22:35 +00:00