From 9dcb5bc36b1fce7ac92eea39a3a60227ca2bfccf Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <aacid@kde.org>
Date: Sun, 19 Jul 2020 23:14:39 +0200
Subject: [PATCH] Use KXMLGUIClient::findVersionNumber if using new enough
 xmlgui

instead of the code we copied from there
---
 xmlgui_helper.cpp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/xmlgui_helper.cpp b/xmlgui_helper.cpp
index 5cba897ba..9a80fa12f 100644
--- a/xmlgui_helper.cpp
+++ b/xmlgui_helper.cpp
@@ -9,9 +9,17 @@
 
 #include "xmlgui_helper.h"
 
+#include "kxmlgui_version.h"
+
+#if KXMLGUI_VERSION >= QT_VERSION_CHECK(5, 73, 0)
+#include <KXMLGUIClient>
+#endif
+
 #include <QDebug>
 #include <QFile>
 
+#if KXMLGUI_VERSION < QT_VERSION_CHECK(5, 73, 0)
+
 // Copied from KXmlGuiVersionHandler::findVersionNumber :/
 static QString findVersionNumber(const QString &xml)
 {
@@ -85,6 +93,8 @@ static QString findVersionNumber(const QString &xml)
     return QString();
 }
 
+#endif
+
 namespace Okular
 {
 void removeRCFileIfVersionSmallerThan(const QString &filePath, int version)
@@ -93,7 +103,11 @@ void removeRCFileIfVersionSmallerThan(const QString &filePath, int version)
     if (f.open(QIODevice::ReadOnly)) {
         const QByteArray contents = f.readAll();
         f.close();
+#if KXMLGUI_VERSION < QT_VERSION_CHECK(5, 73, 0)
         const QString fileVersion = findVersionNumber(contents);
+#else
+        const QString fileVersion = KXMLGUIClient::findVersionNumber(contents);
+#endif
         if (fileVersion.toInt() < version) {
             QFile::remove(filePath);
         }