From bb08bb3f13cbc02e1ae4e15b5ada274e8c96dbbb Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@theqtcompany.com>
Date: Tue, 17 Feb 2015 17:47:32 +0100
Subject: [PATCH] MimeDatabase: Fix compilation with namespaced Qt

Change-Id: I977a115e75302a5341352b593bf3182c0b093031
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
---
 src/libs/utils/mimetypes/mimemagicrule_p.h |  2 ++
 src/libs/utils/mimetypes/mimetype.h        | 24 +++++++++++-----------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/libs/utils/mimetypes/mimemagicrule_p.h b/src/libs/utils/mimetypes/mimemagicrule_p.h
index 25a3b2b52b5..495d2167043 100644
--- a/src/libs/utils/mimetypes/mimemagicrule_p.h
+++ b/src/libs/utils/mimetypes/mimemagicrule_p.h
@@ -99,6 +99,8 @@ private:
 } // Internal
 } // Utils
 
+QT_BEGIN_NAMESPACE
 Q_DECLARE_TYPEINFO(Utils::Internal::MimeMagicRule, Q_MOVABLE_TYPE);
+QT_END_NAMESPACE
 
 #endif // MIMEMAGICRULE_H
diff --git a/src/libs/utils/mimetypes/mimetype.h b/src/libs/utils/mimetypes/mimetype.h
index c0b4df87857..a8f68696cc8 100644
--- a/src/libs/utils/mimetypes/mimetype.h
+++ b/src/libs/utils/mimetypes/mimetype.h
@@ -61,17 +61,17 @@ public:
     MimeType();
     MimeType(const MimeType &other);
     MimeType &operator=(const MimeType &other);
-#ifdef Q_COMPILER_RVALUE_REFS
-    MimeType &operator=(MimeType &&other)
-    {
-        qSwap(d, other.d);
-        return *this;
-    }
-#endif
-    void swap(MimeType &other)
-    {
-        qSwap(d, other.d);
-    }
+//#ifdef Q_COMPILER_RVALUE_REFS
+//    MimeType &operator=(MimeType &&other)
+//    {
+//        qSwap(d, other.d);
+//        return *this;
+//    }
+//#endif
+//    void swap(MimeType &other)
+//    {
+//        qSwap(d, other.d);
+//    }
     explicit MimeType(const Internal::MimeTypePrivate &dd);
     ~MimeType();
 
@@ -118,7 +118,7 @@ protected:
 
 } // Utils
 
-Q_DECLARE_SHARED(Utils::MimeType)
+//Q_DECLARE_SHARED(Utils::MimeType)
 
 #ifndef QT_NO_DEBUG_STREAM
 QT_BEGIN_NAMESPACE