From 188544052c17879cf711d1d2e20a3ae59d4f714f Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Thu, 17 Mar 2022 11:08:52 +0100
Subject: [PATCH] Mimetypes: Make compile with namespaced Qt

Change-Id: I022b4cedee85b60a444241dc3b373aaa2fb924af
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 src/libs/utils/mimetypes2/mimeglobpattern_p.h      | 2 ++
 src/libs/utils/mimetypes2/mimemagicrule_p.h        | 2 ++
 src/libs/utils/mimetypes2/mimemagicrulematcher_p.h | 2 ++
 src/libs/utils/mimetypes2/mimetype.h               | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/src/libs/utils/mimetypes2/mimeglobpattern_p.h b/src/libs/utils/mimetypes2/mimeglobpattern_p.h
index a2f5a83a85b..6519acb66b8 100644
--- a/src/libs/utils/mimetypes2/mimeglobpattern_p.h
+++ b/src/libs/utils/mimetypes2/mimeglobpattern_p.h
@@ -171,4 +171,6 @@ public:
 
 } // namespace Utils
 
+QT_BEGIN_NAMESPACE
 Q_DECLARE_SHARED(Utils::MimeGlobPattern)
+QT_END_NAMESPACE
diff --git a/src/libs/utils/mimetypes2/mimemagicrule_p.h b/src/libs/utils/mimetypes2/mimemagicrule_p.h
index 728e4220b44..8aa48fd51ee 100644
--- a/src/libs/utils/mimetypes2/mimemagicrule_p.h
+++ b/src/libs/utils/mimetypes2/mimemagicrule_p.h
@@ -141,4 +141,6 @@ private:
 
 } // namespace Utils
 
+QT_BEGIN_NAMESPACE
 Q_DECLARE_SHARED(Utils::MimeMagicRule)
+QT_END_NAMESPACE
diff --git a/src/libs/utils/mimetypes2/mimemagicrulematcher_p.h b/src/libs/utils/mimetypes2/mimemagicrulematcher_p.h
index e4b8bcee368..4a4cd1f67f6 100644
--- a/src/libs/utils/mimetypes2/mimemagicrulematcher_p.h
+++ b/src/libs/utils/mimetypes2/mimemagicrulematcher_p.h
@@ -90,4 +90,6 @@ private:
 
 } // namespace Utils
 
+QT_BEGIN_NAMESPACE
 Q_DECLARE_SHARED(Utils::MimeMagicRuleMatcher)
+QT_END_NAMESPACE
diff --git a/src/libs/utils/mimetypes2/mimetype.h b/src/libs/utils/mimetypes2/mimetype.h
index 1e97f69b2f9..b9da254ea8f 100644
--- a/src/libs/utils/mimetypes2/mimetype.h
+++ b/src/libs/utils/mimetypes2/mimetype.h
@@ -132,9 +132,11 @@ protected:
 
 } // namespace Utils
 
+QT_BEGIN_NAMESPACE
 #ifndef QT_NO_DEBUG_STREAM
 class QDebug;
 QTCREATOR_UTILS_EXPORT QDebug operator<<(QDebug debug, const Utils::MimeType &mime);
 #endif
 
 Q_DECLARE_SHARED(Utils::MimeType)
+QT_END_NAMESPACE