From 95f5d7cec1b35e3e9e83669d5657a40cb8d0c88a Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Thu, 29 Aug 2024 09:41:27 +0200
Subject: [PATCH] Update mime database from Qt

qtbase/7337474d041d7e4a7a33157ebd7d84406ed13966
  Convert remaining QT_NO_XMLSTREAM* to use feature system

Change-Id: I632902b690ad3ccf195179b176b5d92b27bd043f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
---
 src/libs/utils/mimetypes2/mimeprovider.cpp   | 12 ++++++------
 src/libs/utils/mimetypes2/mimetypeparser.cpp | 18 +++++++++---------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/libs/utils/mimetypes2/mimeprovider.cpp b/src/libs/utils/mimetypes2/mimeprovider.cpp
index 00be193bcd3..6e8e7b7706b 100644
--- a/src/libs/utils/mimetypes2/mimeprovider.cpp
+++ b/src/libs/utils/mimetypes2/mimeprovider.cpp
@@ -514,11 +514,7 @@ void MimeBinaryProvider::addAllMimeTypes(QList<MimeType> &result)
 
 bool MimeBinaryProvider::loadMimeTypePrivate(MimeTypePrivate &data)
 {
-#ifdef QT_NO_XMLSTREAMREADER
-    Q_UNUSED(data);
-    qWarning("Cannot load mime type since QXmlStreamReader is not available.");
-    return false;
-#else
+#if QT_CONFIG(xmlstreamreader)
     if (data.loaded)
         return true;
 
@@ -589,7 +585,11 @@ bool MimeBinaryProvider::loadMimeTypePrivate(MimeTypePrivate &data)
     data.localeComments = e.localeComments;
     data.globPatterns = e.globPatterns;
     return true;
-#endif //QT_NO_XMLSTREAMREADER
+#else
+    Q_UNUSED(data);
+    qWarning("Cannot load mime type since QXmlStreamReader is not available.");
+    return false;
+#endif // feature xmlstreamreader
 }
 
 // Binary search in the icons or generic-icons list
diff --git a/src/libs/utils/mimetypes2/mimetypeparser.cpp b/src/libs/utils/mimetypes2/mimetypeparser.cpp
index 43af53e9ff7..ce7f1caa86c 100644
--- a/src/libs/utils/mimetypes2/mimetypeparser.cpp
+++ b/src/libs/utils/mimetypes2/mimetypeparser.cpp
@@ -137,7 +137,7 @@ bool MimeTypeParserBase::parseNumber(QStringView n, int *target, QString *errorM
     return true;
 }
 
-#ifndef QT_NO_XMLSTREAMREADER
+#if QT_CONFIG(xmlstreamreader)
 struct CreateMagicMatchRuleResult
 {
     QString errorMessage; // must be first
@@ -158,16 +158,11 @@ static CreateMagicMatchRuleResult createMagicMatchRule(const QXmlStreamAttribute
     const auto mask = atts.value(QLatin1StringView(matchMaskAttributeC));
     return CreateMagicMatchRuleResult(type, value, offsets, mask);
 }
-#endif
+#endif // feature xmlstreamreader
 
 bool MimeTypeParserBase::parse(QIODevice *dev, const QString &fileName, QString *errorMessage)
 {
-#ifdef QT_NO_XMLSTREAMREADER
-    Q_UNUSED(dev);
-    if (errorMessage)
-        *errorMessage = QString::fromLatin1("QXmlStreamReader is not available, cannot parse '%1'.").arg(fileName);
-    return false;
-#else
+#if QT_CONFIG(xmlstreamreader)
     MimeTypePrivate data;
     data.loaded = true;
     int priority = 50;
@@ -309,7 +304,12 @@ bool MimeTypeParserBase::parse(QIODevice *dev, const QString &fileName, QString
     }
 
     return true;
-#endif //QT_NO_XMLSTREAMREADER
+#else
+    Q_UNUSED(dev);
+    if (errorMessage)
+        *errorMessage = QString::fromLatin1("QXmlStreamReader is not available, cannot parse '%1'.").arg(fileName);
+    return false;
+#endif // feature xmlstreamreader
 }
 
 } // namespace Utils