diff options
Diffstat (limited to 'src/corelib/mimetypes')
-rw-r--r-- | src/corelib/mimetypes/qmimedatabase_p.h | 1 | ||||
-rw-r--r-- | src/corelib/mimetypes/qmimetype.cpp | 13 | ||||
-rw-r--r-- | src/corelib/mimetypes/qmimetype.h | 4 |
3 files changed, 17 insertions, 1 deletions
diff --git a/src/corelib/mimetypes/qmimedatabase_p.h b/src/corelib/mimetypes/qmimedatabase_p.h index e3cfe3443f..1308907b9b 100644 --- a/src/corelib/mimetypes/qmimedatabase_p.h +++ b/src/corelib/mimetypes/qmimedatabase_p.h @@ -52,7 +52,6 @@ #include "qmimetype_p.h" #include "qmimeglobpattern_p.h" -#include <QtCore/qhash.h> #include <QtCore/qmutex.h> QT_BEGIN_NAMESPACE diff --git a/src/corelib/mimetypes/qmimetype.cpp b/src/corelib/mimetypes/qmimetype.cpp index a5f9cb70d5..3206ff66e3 100644 --- a/src/corelib/mimetypes/qmimetype.cpp +++ b/src/corelib/mimetypes/qmimetype.cpp @@ -43,6 +43,7 @@ #include <QtCore/QDebug> #include <QtCore/QLocale> +#include <QtCore/QHashFunctions> #include <memory> @@ -181,6 +182,18 @@ bool QMimeType::operator==(const QMimeType &other) const } /*! + \since 5.6 + \relates QMimeType + + Returns the hash value for \a key, using + \a seed to seed the calculation. + */ +uint qHash(const QMimeType &key, uint seed) Q_DECL_NOTHROW +{ + return qHash(key.d->name, seed); +} + +/*! \fn bool QMimeType::operator!=(const QMimeType &other) const; Returns \c true if \a other does not equal this QMimeType object, otherwise returns \c false. */ diff --git a/src/corelib/mimetypes/qmimetype.h b/src/corelib/mimetypes/qmimetype.h index 4ba3c53470..5693b703ee 100644 --- a/src/corelib/mimetypes/qmimetype.h +++ b/src/corelib/mimetypes/qmimetype.h @@ -46,6 +46,9 @@ QT_BEGIN_NAMESPACE class QMimeTypePrivate; class QFileinfo; class QStringList; +class QMimeType; + +Q_CORE_EXPORT uint qHash(const QMimeType &key, uint seed = 0) Q_DECL_NOTHROW; class Q_CORE_EXPORT QMimeType { @@ -100,6 +103,7 @@ protected: friend class QMimeXMLProvider; friend class QMimeBinaryProvider; friend class QMimeTypePrivate; + friend Q_CORE_EXPORT uint qHash(const QMimeType &key, uint seed) Q_DECL_NOTHROW; QExplicitlySharedDataPointer<QMimeTypePrivate> d; }; |