diff options
| author | Henning Gruendl <henning.gruendl@qt.io> | 2020-03-09 08:46:05 +0100 |
|---|---|---|
| committer | Thomas Hartmann <thomas.hartmann@qt.io> | 2020-03-09 12:17:33 +0000 |
| commit | aaa9a5151198fefb63fdcfe9c56cbed5ea51e0cc (patch) | |
| tree | 28b2e17866d09a00b5a48b4ad98b832267fd4128 /src/libs | |
| parent | 5db38c5937da6fa465e7b0df537292af2d80300f (diff) | |
ADS: Fix QHash unite warning for 5.15
Change-Id: I384f810bd15ec0c0b191dcdd0654f089de9e8ecb
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Diffstat (limited to 'src/libs')
| -rw-r--r-- | src/libs/advanceddockingsystem/workspacemodel.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/libs/advanceddockingsystem/workspacemodel.cpp b/src/libs/advanceddockingsystem/workspacemodel.cpp index 08d1296673..04ff7b4c75 100644 --- a/src/libs/advanceddockingsystem/workspacemodel.cpp +++ b/src/libs/advanceddockingsystem/workspacemodel.cpp @@ -166,7 +166,14 @@ QHash<int, QByteArray> WorkspaceModel::roleNames() const {PresetWorkspaceRole, "presetWorkspace"}, {LastWorkspaceRole, "activeWorkspace"}, {ActiveWorkspaceRole, "lastWorkspace"}}; + +#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)) + auto defaultRoles = QAbstractTableModel::roleNames(); + defaultRoles.insert(extraRoles); + return defaultRoles; +#else return QAbstractTableModel::roleNames().unite(extraRoles); +#endif } void WorkspaceModel::sort(int column, Qt::SortOrder order) |