From fc8059575edf33218437316f9d978b886cffe10a Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <aacid@kde.org>
Date: Sat, 19 Nov 2022 11:10:16 +0100
Subject: [PATCH] Two more version checks that are not needed now

---
 generators/poppler/generator_pdf.cpp | 4 ----
 part/part.cpp                        | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/generators/poppler/generator_pdf.cpp b/generators/poppler/generator_pdf.cpp
index a30e0a9dd..945f3863a 100644
--- a/generators/poppler/generator_pdf.cpp
+++ b/generators/poppler/generator_pdf.cpp
@@ -916,13 +916,9 @@ Okular::DocumentInfo PDFGenerator::generateDocumentInfo(const QSet<Okular::Docum
         }
         if (keys.contains(Okular::DocumentInfo::CustomKeys)) {
             int major, minor;
-#if POPPLER_VERSION_MACRO >= QT_VERSION_CHECK(21, 8, 0)
             auto version = pdfdoc->getPdfVersion();
             major = version.major;
             minor = version.minor;
-#else
-            pdfdoc->getPdfVersion(&major, &minor);
-#endif
             docInfo.set(QStringLiteral("format"), i18nc("PDF v. <version>", "PDF v. %1.%2", major, minor), i18n("Format"));
             docInfo.set(QStringLiteral("encryption"), pdfdoc->isEncrypted() ? i18n("Encrypted") : i18n("Unencrypted"), i18n("Security"));
             docInfo.set(QStringLiteral("optimization"), pdfdoc->isLinearized() ? i18n("Yes") : i18n("No"), i18n("Optimized"));
diff --git a/part/part.cpp b/part/part.cpp
index ebc619a76..e23eb138b 100644
--- a/part/part.cpp
+++ b/part/part.cpp
@@ -71,8 +71,6 @@
 #ifdef WITH_KWALLET
 #include <KWallet>
 #endif
-#include "kconfigwidgets_version.h"
-#include "kxmlgui_version.h" // TODO KF 5.79 Remove this include, because the relevant section below will also be removed.
 #include <KXMLGUIClient>
 #include <KXMLGUIFactory>
 
@@ -856,11 +854,9 @@ void Part::setupActions()
 {
     KActionCollection *ac = actionCollection();
 
-#if KCONFIGWIDGETS_VERSION >= QT_VERSION_CHECK(5, 89, 0)
     auto manager = new KColorSchemeManager(this);
     KActionMenu *schemeMenu = manager->createSchemeSelectionMenu(this);
     ac->addAction(QStringLiteral("colorscheme_menu"), schemeMenu->menu()->menuAction());
-#endif
 
     m_copy = KStandardAction::create(KStandardAction::Copy, m_pageView, SLOT(copyTextSelection()), ac);