From 7c7fa73020ead3b8050133e5503286105735ae93 Mon Sep 17 00:00:00 2001 From: Volker Krause Date: Tue, 8 Apr 2025 18:46:13 +0200 Subject: [PATCH] Remove conditions for no longer supported Qt versions --- src/imageformats/jxl.cpp | 2 +- src/imageformats/xcf.cpp | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/imageformats/jxl.cpp b/src/imageformats/jxl.cpp index 4bda057..b49ab93 100644 --- a/src/imageformats/jxl.cpp +++ b/src/imageformats/jxl.cpp @@ -20,7 +20,7 @@ #include // Avoid rotation on buggy Qts (see also https://bugreports.qt.io/browse/QTBUG-126575) -#if (QT_VERSION >= QT_VERSION_CHECK(6, 5, 7) && QT_VERSION < QT_VERSION_CHECK(6, 6, 0)) || (QT_VERSION >= QT_VERSION_CHECK(6, 7, 3)) +#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 3) #ifndef JXL_QT_AUTOTRANSFORM #define JXL_QT_AUTOTRANSFORM #endif diff --git a/src/imageformats/xcf.cpp b/src/imageformats/xcf.cpp index b9ebe99..26d74a7 100644 --- a/src/imageformats/xcf.cpp +++ b/src/imageformats/xcf.cpp @@ -962,11 +962,7 @@ bool XCFImageFormat::loadImageProperties(QDataStream &xcf_io, XCFImage &xcf_imag case PROP_PARASITES: while (!property.atEnd()) { char *tag; -#if QT_VERSION < QT_VERSION_CHECK(6, 7, 0) - quint32 size; -#else qint64 size; -#endif property.readBytes(tag, size);