forked from qt-creator/qt-creator
QmlDesigner: Remove unused global static
Building CXX object src/plugins/qmlde...dir/components/componentcore/designericons.cpp.o /data/dev/creator-out/src/plugins/qmldesigner/components/componentcore/designericons.cpp:84:21: warning: ‘const QStringList& {anonymous}::iconFontMandatoryKeys()’ defined but not used [-Wunused-function] 84 | const QStringList & iconFontMandatoryKeys() | ^~~~~~~~~~~~~~~~~~~~~ Change-Id: I978d6a52cf4030fe07352d6ee89c2db3d0433c05 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
@@ -79,21 +79,6 @@ EType DesignerIconEnums<EType>::value(const QString &keyStr, bool *ok)
|
|||||||
return static_cast<EType>(metaEnum.keyToValue(keyStr.toLatin1(), ok));
|
return static_cast<EType>(metaEnum.keyToValue(keyStr.toLatin1(), ok));
|
||||||
}
|
}
|
||||||
|
|
||||||
Q_GLOBAL_STATIC(QStringList, _iconFontMandatoryKeys);
|
|
||||||
|
|
||||||
const QStringList & iconFontMandatoryKeys()
|
|
||||||
{
|
|
||||||
if (_iconFontMandatoryKeys->isEmpty()) {
|
|
||||||
*_iconFontMandatoryKeys
|
|
||||||
<< DesignerIconEnums<Theme::Icon>::keyName
|
|
||||||
<< DesignerIconEnums<Theme::Color>::keyName
|
|
||||||
<< DesignerIconEnums<QIcon::Mode>::keyName
|
|
||||||
<< DesignerIconEnums<QIcon::State>::keyName
|
|
||||||
<< "size";
|
|
||||||
}
|
|
||||||
return *_iconFontMandatoryKeys;
|
|
||||||
}
|
|
||||||
|
|
||||||
QJsonObject mergeJsons(const QJsonObject &prior, const QJsonObject &joiner)
|
QJsonObject mergeJsons(const QJsonObject &prior, const QJsonObject &joiner)
|
||||||
{
|
{
|
||||||
QJsonObject object = prior;
|
QJsonObject object = prior;
|
||||||
|
Reference in New Issue
Block a user