From d34c1668aa39f6140d547c498141a405a8dd4259 Mon Sep 17 00:00:00 2001 From: Volker Krause Date: Wed, 1 Feb 2023 17:16:45 +0100 Subject: [PATCH] Bump Qt deprecation level to 6.4 --- CMakeLists.txt | 4 ++-- autotests/readtest.cpp | 4 ++-- autotests/writetest.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b570379..68c0c35 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -78,8 +78,8 @@ set_package_properties(LibRaw PROPERTIES ) ecm_set_disabled_deprecation_versions( - QT 5.15.2 - KF 5.95 + QT 6.4 + KF 5.102 ) add_subdirectory(src) diff --git a/autotests/readtest.cpp b/autotests/readtest.cpp index bf0fb07..e02badf 100644 --- a/autotests/readtest.cpp +++ b/autotests/readtest.cpp @@ -162,9 +162,9 @@ int main(int argc, char **argv) if (!fi.suffix().compare("png", Qt::CaseInsensitive)) { continue; } - int suffixPos = fi.filePath().count() - suffix.count(); + int suffixPos = fi.filePath().size() - suffix.size(); QString inputfile = fi.filePath(); - QString expfile = fi.filePath().replace(suffixPos, suffix.count(), QStringLiteral("png")); + QString expfile = fi.filePath().replace(suffixPos, suffix.size(), QStringLiteral("png")); QString expfilename = QFileInfo(expfile).fileName(); std::unique_ptr inputDevice(seq ? new SequentialFile(inputfile) : new QFile(inputfile)); diff --git a/autotests/writetest.cpp b/autotests/writetest.cpp index 011385f..b42bf1d 100644 --- a/autotests/writetest.cpp +++ b/autotests/writetest.cpp @@ -85,8 +85,8 @@ int main(int argc, char **argv) if (parser.isSet(ignoreDataCheck)) { pngfile = fi.filePath(); } else { - int suffixPos = fi.filePath().count() - suffix.count(); - pngfile = fi.filePath().replace(suffixPos, suffix.count(), QStringLiteral("png")); + int suffixPos = fi.filePath().size() - suffix.size(); + pngfile = fi.filePath().replace(suffixPos, suffix.size(), QStringLiteral("png")); } QString pngfilename = QFileInfo(pngfile).fileName();