diff options
| author | hjk <hjk@qt.io> | 2020-02-19 10:13:33 +0100 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2020-02-25 10:43:10 +0000 |
| commit | e5d1e9d2743a8cecc2f0ecb1df15ef7eadedf637 (patch) | |
| tree | 80f674cfa44a9d0564bb3b2969d0477834ec7660 /src/plugins/projectexplorer | |
| parent | aeef7137a28cfa69ff0b8c45445c04ae8e354d7b (diff) | |
| download | qt-creator-e5d1e9d2743a8cecc2f0ecb1df15ef7eadedf637.tar.gz | |
Work around QHash::unite deprecation
Change-Id: Ibf199b5e3f2ca99b7e0cafe20893a509d9eab906
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/projectexplorer')
| -rw-r--r-- | src/plugins/projectexplorer/sessionmodel.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/projectexplorer/sessionmodel.cpp b/src/plugins/projectexplorer/sessionmodel.cpp index 9e92694116..a535294f91 100644 --- a/src/plugins/projectexplorer/sessionmodel.cpp +++ b/src/plugins/projectexplorer/sessionmodel.cpp @@ -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) |