diff options
author | Jędrzej Nowacki <jedrzej.nowacki@qt.io> | 2019-02-28 14:06:47 +0100 |
---|---|---|
committer | Jędrzej Nowacki <jedrzej.nowacki@qt.io> | 2019-03-04 09:26:02 +0000 |
commit | fa1b8442b8e6d01d0352a062a6aa8df6956f77f9 (patch) | |
tree | 0bed0f16a1739e1e248a48fc196c054fdf8e7abb | |
parent | eea3947842e461662cea4a31c7a5dd7f1969ec23 (diff) |
Fix warnings when compiling with QT_NO_XMLSTREAM
Some of function arguments were unused.
Change-Id: I29e8e4acbed87836044cac4f0b7ac59168181f5a
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
-rw-r--r-- | src/corelib/mimetypes/qmimeprovider.cpp | 1 | ||||
-rw-r--r-- | src/corelib/mimetypes/qmimetypeparser.cpp | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/corelib/mimetypes/qmimeprovider.cpp b/src/corelib/mimetypes/qmimeprovider.cpp index d5b8825972..5e1447aaa9 100644 --- a/src/corelib/mimetypes/qmimeprovider.cpp +++ b/src/corelib/mimetypes/qmimeprovider.cpp @@ -458,6 +458,7 @@ void QMimeBinaryProvider::addAllMimeTypes(QList<QMimeType> &result) void QMimeBinaryProvider::loadMimeTypePrivate(QMimeTypePrivate &data) { #ifdef QT_NO_XMLSTREAMREADER + Q_UNUSED(data); qWarning("Cannot load mime type since QXmlStreamReader is not available."); return; #else diff --git a/src/corelib/mimetypes/qmimetypeparser.cpp b/src/corelib/mimetypes/qmimetypeparser.cpp index d10575cfe9..815e0aa03b 100644 --- a/src/corelib/mimetypes/qmimetypeparser.cpp +++ b/src/corelib/mimetypes/qmimetypeparser.cpp @@ -194,8 +194,9 @@ static CreateMagicMatchRuleResult createMagicMatchRule(const QXmlStreamAttribute bool QMimeTypeParserBase::parse(QIODevice *dev, const QString &fileName, QString *errorMessage) { #ifdef QT_NO_XMLSTREAMREADER + Q_UNUSED(dev); if (errorMessage) - *errorMessage = QString::fromLatin1("QXmlStreamReader is not available, cannot parse."); + *errorMessage = QString::fromLatin1("QXmlStreamReader is not available, cannot parse '%1'.").arg(fileName); return false; #else QMimeTypePrivate data; |