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/projectexplorer/sessionmodel.cpp
View File

@@ -165,7 +165,7 @@ QVariant SessionModel::data(const QModelIndex &index, int role) const
QHash<int, QByteArray> SessionModel::roleNames() const
{
static QHash<int, QByteArray> extraRoles{
static const QHash<int, QByteArray> extraRoles{
{Qt::DisplayRole, "sessionName"},
{DefaultSessionRole, "defaultSession"},
{ActiveSessionRole, "activeSession"},
@@ -173,7 +173,9 @@ QHash<int, QByteArray> SessionModel::roleNames() const
{ProjectsPathRole, "projectsPath"},
{ProjectsDisplayRole, "projectsName"}
};
return QAbstractTableModel::roleNames().unite(extraRoles);
QHash<int, QByteArray> roles = QAbstractTableModel::roleNames();
Utils::addToHash(&roles, extraRoles);
return roles;
}
void SessionModel::sort(int column, Qt::SortOrder order)