summaryrefslogtreecommitdiffstats
path: root/src/corelib/mimetypes/qmimedatabase.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib/mimetypes/qmimedatabase.h')
-rw-r--r--src/corelib/mimetypes/qmimedatabase.h13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/corelib/mimetypes/qmimedatabase.h b/src/corelib/mimetypes/qmimedatabase.h
index eff706e1b5..96ddee73c4 100644
--- a/src/corelib/mimetypes/qmimedatabase.h
+++ b/src/corelib/mimetypes/qmimedatabase.h
@@ -77,8 +77,17 @@ public:
QMimeType mimeTypeForData(QIODevice *device) const;
QMimeType mimeTypeForUrl(const QUrl &url) const;
- QMimeType mimeTypeForNameAndData(const QString &fileName, QIODevice *device) const;
- QMimeType mimeTypeForNameAndData(const QString &fileName, const QByteArray &data) const;
+ QMimeType mimeTypeForFileNameAndData(const QString &fileName, QIODevice *device) const;
+ QMimeType mimeTypeForFileNameAndData(const QString &fileName, const QByteArray &data) const;
+
+#if QT_DEPRECATED_SINCE(5,0)
+ QT_DEPRECATED QMimeType mimeTypeForNameAndData(const QString &fileName, QIODevice *device) const {
+ return mimeTypeForFileNameAndData(fileName, device);
+ }
+ QT_DEPRECATED QMimeType mimeTypeForNameAndData(const QString &fileName, const QByteArray &data) const {
+ return mimeTypeForFileNameAndData(fileName, data);
+ }
+#endif
QString suffixForFileName(const QString &fileName) const;