From 75a3723c45e3cfeae6c57b7661e0a8864f42b51c Mon Sep 17 00:00:00 2001 From: Nathaniel Graham Date: Thu, 16 Nov 2017 08:17:08 -0700 Subject: [PATCH] Depend on KIO::PreviewJob::defaultPlugins() and KF 5.40 Summary: master now has KF 5.40, so require that and always use KIO::PreviewJob::defaultPlugins(), which lets us get rid of some unnecessary code Test Plan: Tested in KDE Neon. Compiles and deploys fine. Reviewers: #frameworks, broulik, elvisangelaccio Reviewed By: elvisangelaccio Differential Revision: https://phabricator.kde.org/D8847 --- CMakeLists.txt | 2 +- thumbnail/thumbnail.cpp | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 073d4ad1..f7df1de7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ project(kio-extras VERSION ${KDE_APPLICATIONS_VERSION}) include(FeatureSummary) set(QT_MIN_VERSION "5.5.0") -set(KF5_MIN_VERSION "5.3.0") +set(KF5_MIN_VERSION "5.40.0") find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS DBus Network Widgets Svg) find_package(Qt5Test ${QT_MIN_VERSION} CONFIG QUIET) diff --git a/thumbnail/thumbnail.cpp b/thumbnail/thumbnail.cpp index 6b25c191..fceb7f8c 100644 --- a/thumbnail/thumbnail.cpp +++ b/thumbnail/thumbnail.cpp @@ -663,14 +663,7 @@ bool ThumbnailProtocol::createSubThumbnail(QImage& thumbnail, const QString& fil { if (m_enabledPlugins.isEmpty()) { const KConfigGroup globalConfig(KSharedConfig::openConfig(), "PreviewSettings"); -#if KIO_VERSION >= QT_VERSION_CHECK(5, 40, 0) m_enabledPlugins = globalConfig.readEntry("Plugins", KIO::PreviewJob::defaultPlugins()); -#else - // We don't have KF5.40 yet; emulate the behavior of KIO::PreviewJob::defaultPlugins() - QStringList defaultPlugins = KIO::PreviewJob::availablePlugins(); - defaultPlugins.removeAll(QStringLiteral("textthumbnail")); - m_enabledPlugins = globalConfig.readEntry("Plugins", defaultPlugins); -#endif } const QMimeDatabase db; -- GitLab