feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

MimeDatabase: Fix compilation with namespaced Qt

Browse Source 
Change-Id: I977a115e75302a5341352b593bf3182c0b093031
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
Eike Ziller
2015-02-17 17:47:32 +01:00
parent 4f5f5d75b4
commit bb08bb3f13
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/utils/mimetypes/mimemagicrule_p.h
View File

@@ -99,6 +99,8 @@ private:
} // Internal } // Internal
} // Utils } // Utils
QT_BEGIN_NAMESPACE
Q_DECLARE_TYPEINFO(Utils::Internal::MimeMagicRule, Q_MOVABLE_TYPE); Q_DECLARE_TYPEINFO(Utils::Internal::MimeMagicRule, Q_MOVABLE_TYPE);
QT_END_NAMESPACE
#endif // MIMEMAGICRULE_H #endif // MIMEMAGICRULE_H

24
src/libs/utils/mimetypes/mimetype.h
View File

@@ -61,17 +61,17 @@ public:
MimeType(); MimeType();
MimeType(const MimeType &other); MimeType(const MimeType &other);
MimeType &operator=(const MimeType &other); MimeType &operator=(const MimeType &other);
#ifdef Q_COMPILER_RVALUE_REFS //#ifdef Q_COMPILER_RVALUE_REFS
MimeType &operator=(MimeType &&other) // MimeType &operator=(MimeType &&other)
{ // {
qSwap(d, other.d); // qSwap(d, other.d);
return *this; // return *this;
} // }
#endif //#endif
void swap(MimeType &other) // void swap(MimeType &other)
{ // {
qSwap(d, other.d); // qSwap(d, other.d);
} // }
explicit MimeType(const Internal::MimeTypePrivate &dd); explicit MimeType(const Internal::MimeTypePrivate &dd);
~MimeType(); ~MimeType();
@@ -118,7 +118,7 @@ protected:
} // Utils } // Utils
Q_DECLARE_SHARED(Utils::MimeType) //Q_DECLARE_SHARED(Utils::MimeType)
#ifndef QT_NO_DEBUG_STREAM #ifndef QT_NO_DEBUG_STREAM
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE