From 1d4948bc8296aa43c7ef369d3ed920191f554408 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Thu, 8 Aug 2024 15:36:36 +0200
Subject: [PATCH] Update mime database from Qt

qtbase/ffa5820fa3bf8b28675129919d748373d6c77827
  Core: Do not depend on transitive includes

Change-Id: I6f3f5d8666461fd9388ec328577f77cc49992e7b
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
---
 src/libs/utils/mimetypes2/mimedatabase.cpp  | 12 ++++++------
 src/libs/utils/mimetypes2/mimemagicrule.cpp |  2 +-
 src/libs/utils/mimetypes2/mimeprovider.cpp  |  1 +
 src/libs/utils/mimetypes2/mimeprovider_p.h  |  1 +
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/libs/utils/mimetypes2/mimedatabase.cpp b/src/libs/utils/mimetypes2/mimedatabase.cpp
index 8651eeffe27..adc6c23879e 100644
--- a/src/libs/utils/mimetypes2/mimedatabase.cpp
+++ b/src/libs/utils/mimetypes2/mimedatabase.cpp
@@ -15,12 +15,12 @@
 
 #include <nanotrace/nanotrace.h>
 
-#include <QFile>
-#include <QFileInfo>
-#include <QStandardPaths>
-#include <QBuffer>
-#include <QUrl>
-#include <QDebug>
+#include <QtCore/QFile>
+#include <QtCore/QFileInfo>
+#include <QtCore/QStandardPaths>
+#include <QtCore/QBuffer>
+#include <QtCore/QUrl>
+#include <QtCore/QDebug>
 
 #include <algorithm>
 #include <functional>
diff --git a/src/libs/utils/mimetypes2/mimemagicrule.cpp b/src/libs/utils/mimetypes2/mimemagicrule.cpp
index 3cd3557dd8e..5578e8d2e4a 100644
--- a/src/libs/utils/mimetypes2/mimemagicrule.cpp
+++ b/src/libs/utils/mimetypes2/mimemagicrule.cpp
@@ -4,9 +4,9 @@
 #include "mimemagicrule_p.h"
 
 #include "mimetypeparser_p.h"
-
 #include <QtCore/QDebug>
 #include <QtCore/QList>
+#include <QtCore/QMap>
 #include <qendian.h>
 
 namespace Utils {
diff --git a/src/libs/utils/mimetypes2/mimeprovider.cpp b/src/libs/utils/mimetypes2/mimeprovider.cpp
index 682cbb7e8a5..aa3caa1cf67 100644
--- a/src/libs/utils/mimetypes2/mimeprovider.cpp
+++ b/src/libs/utils/mimetypes2/mimeprovider.cpp
@@ -9,6 +9,7 @@
 #include "mimemagicrulematcher_p.h"
 
 #include <qstandardpaths.h>
+#include <QMap>
 #include <QXmlStreamReader>
 #include <QBuffer>
 #include <QDir>
diff --git a/src/libs/utils/mimetypes2/mimeprovider_p.h b/src/libs/utils/mimetypes2/mimeprovider_p.h
index e3b249261ea..4cf15a8e366 100644
--- a/src/libs/utils/mimetypes2/mimeprovider_p.h
+++ b/src/libs/utils/mimetypes2/mimeprovider_p.h
@@ -20,6 +20,7 @@
 #include "mimeglobpattern_p.h"
 #include <QtCore/qdatetime.h>
 #include <QtCore/qset.h>
+#include <QtCore/qmap.h>
 
 namespace Utils {