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

Update mime database from Qt

Browse Source 
qtbase/7337474d041d7e4a7a33157ebd7d84406ed13966
  Convert remaining QT_NO_XMLSTREAM* to use feature system

Change-Id: I632902b690ad3ccf195179b176b5d92b27bd043f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
Eike Ziller
2024-08-29 09:41:27 +02:00
parent d0021a1edd
commit 95f5d7cec1
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libs/utils/mimetypes2/mimeprovider.cpp
View File

@@ -514,11 +514,7 @@ void MimeBinaryProvider::addAllMimeTypes(QList<MimeType> &result)
bool MimeBinaryProvider::loadMimeTypePrivate(MimeTypePrivate &data) bool MimeBinaryProvider::loadMimeTypePrivate(MimeTypePrivate &data)
{ {
#ifdef QT_NO_XMLSTREAMREADER #if QT_CONFIG(xmlstreamreader)
Q_UNUSED(data);
qWarning("Cannot load mime type since QXmlStreamReader is not available.");
return false;
#else
if (data.loaded) if (data.loaded)
return true; return true;
@@ -589,7 +585,11 @@ bool MimeBinaryProvider::loadMimeTypePrivate(MimeTypePrivate &data)
data.localeComments = e.localeComments; data.localeComments = e.localeComments;
data.globPatterns = e.globPatterns; data.globPatterns = e.globPatterns;
return true; return true;
#endif //QT_NO_XMLSTREAMREADER #else
Q_UNUSED(data);
qWarning("Cannot load mime type since QXmlStreamReader is not available.");
return false;
#endif // feature xmlstreamreader
} }
// Binary search in the icons or generic-icons list // Binary search in the icons or generic-icons list

18
src/libs/utils/mimetypes2/mimetypeparser.cpp
View File

@@ -137,7 +137,7 @@ bool MimeTypeParserBase::parseNumber(QStringView n, int *target, QString *errorM
return true; return true;
} }
#ifndef QT_NO_XMLSTREAMREADER #if QT_CONFIG(xmlstreamreader)
struct CreateMagicMatchRuleResult struct CreateMagicMatchRuleResult
{ {
QString errorMessage; // must be first QString errorMessage; // must be first
@@ -158,16 +158,11 @@ static CreateMagicMatchRuleResult createMagicMatchRule(const QXmlStreamAttribute
const auto mask = atts.value(QLatin1StringView(matchMaskAttributeC)); const auto mask = atts.value(QLatin1StringView(matchMaskAttributeC));
return CreateMagicMatchRuleResult(type, value, offsets, mask); return CreateMagicMatchRuleResult(type, value, offsets, mask);
} }
#endif #endif // feature xmlstreamreader
bool MimeTypeParserBase::parse(QIODevice *dev, const QString &fileName, QString *errorMessage) bool MimeTypeParserBase::parse(QIODevice *dev, const QString &fileName, QString *errorMessage)
{ {
#ifdef QT_NO_XMLSTREAMREADER #if QT_CONFIG(xmlstreamreader)
Q_UNUSED(dev);
if (errorMessage)
*errorMessage = QString::fromLatin1("QXmlStreamReader is not available, cannot parse '%1'.").arg(fileName);
return false;
#else
MimeTypePrivate data; MimeTypePrivate data;
data.loaded = true; data.loaded = true;
int priority = 50; int priority = 50;
@@ -309,7 +304,12 @@ bool MimeTypeParserBase::parse(QIODevice *dev, const QString &fileName, QString
} }
return true; return true;
#endif //QT_NO_XMLSTREAMREADER #else
Q_UNUSED(dev);
if (errorMessage)
*errorMessage = QString::fromLatin1("QXmlStreamReader is not available, cannot parse '%1'.").arg(fileName);
return false;
#endif // feature xmlstreamreader
} }
} // namespace Utils } // namespace Utils