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

Work around QHash::unite deprecation

Browse Source 
Change-Id: Ibf199b5e3f2ca99b7e0cafe20893a509d9eab906
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2020-02-19 10:13:33 +01:00
parent aeef7137a2
commit e5d1e9d274
6 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qmlprofiler/flamegraphmodel.cpp
View File

@@ -312,7 +312,7 @@ QVariant FlameGraphModel::data(const QModelIndex &index, int role) const
QHash<int, QByteArray> FlameGraphModel::roleNames() const
{
static QHash<int, QByteArray> extraRoles{
static const QHash<int, QByteArray> extraRoles{
{TypeIdRole, "typeId"},
{TypeRole, "type"},
{DurationRole, "duration"},
@@ -328,7 +328,9 @@ QHash<int, QByteArray> FlameGraphModel::roleNames() const
{AllocationsRole, "allocations" },
{MemoryRole, "memory" }
};
return QAbstractItemModel::roleNames().unite(extraRoles);
QHash<int, QByteArray> roles = QAbstractItemModel::roleNames();
Utils::addToHash(&roles, extraRoles);
return roles;
}
QmlProfilerModelManager *FlameGraphModel::modelManager() const