diff --git a/CMakeLists.txt b/CMakeLists.txt index 29d6ce5..43fdca7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -81,7 +81,7 @@ set_package_properties(LibRaw PROPERTIES ) ecm_set_disabled_deprecation_versions( - QT 6.4 + QT 6.5 KF 5.102 ) diff --git a/src/imageformats/exr.cpp b/src/imageformats/exr.cpp index b7121d5..042bbe7 100644 --- a/src/imageformats/exr.cpp +++ b/src/imageformats/exr.cpp @@ -90,10 +90,7 @@ #include #include #include - -#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) #include -#endif // Allow the code to works on all QT versions supported by KDE // project (Qt 5.15 and Qt 6.x) to easy backports fixes. @@ -319,11 +316,7 @@ static void readMetadata(const Imf::Header &header, QImage &image) } auto dateTime = QDateTime::fromString(QString::fromStdString(capDate->value()), QStringLiteral("yyyy:MM:dd HH:mm:ss")); if (dateTime.isValid()) { -#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) dateTime.setTimeZone(QTimeZone::fromSecondsAheadOfUtc(off)); -#else - dateTime.setOffsetFromUtc(off); -#endif image.setText(QStringLiteral("CreationDate"), dateTime.toString(Qt::ISODate)); } }