diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2021-08-26 11:09:08 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2021-08-26 11:09:08 +0200 |
| commit | 0777b65db3589324ab45ea5d08ad68860623e69b (patch) | |
| tree | fe5e03fc4a36397649f6ec6791b3488efec8c1b4 /src/plugins/projectexplorer/projectmodels.cpp | |
| parent | 245b6c0dc73087678de941652f8c752bb49995cf (diff) | |
| parent | cd8da8fe5f608d4968b90f19f30b515058605b8c (diff) | |
| download | qt-creator-0777b65db3589324ab45ea5d08ad68860623e69b.tar.gz | |
Merge remote-tracking branch 'origin/5.0'
Conflicts:
qbs/modules/qtc/qtc.qbs
src/plugins/android/androidconfigurations.cpp
Change-Id: If8dc2cdf131811e08ca147c6f58dbb3ed3bf7227
Diffstat (limited to 'src/plugins/projectexplorer/projectmodels.cpp')
| -rw-r--r-- | src/plugins/projectexplorer/projectmodels.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/projectexplorer/projectmodels.cpp b/src/plugins/projectexplorer/projectmodels.cpp index b34fd3e461..d5655e3584 100644 --- a/src/plugins/projectexplorer/projectmodels.cpp +++ b/src/plugins/projectexplorer/projectmodels.cpp @@ -235,7 +235,7 @@ QVariant FlatModel::data(const QModelIndex &index, int role) const } case Qt::DecorationRole: { if (!folderNode) - return Core::FileIconProvider::icon(node->filePath()); + return node->asFileNode()->icon(); if (!project) return folderNode->icon(); static QIcon warnIcon = Utils::Icons::WARNING.icon(); |