From f534624fce9a5f1f3d1573c6800cbec5dec8edbf Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 20 Nov 2020 16:08:08 +0100 Subject: Fix build with newest Qt 6 No implicit casts from QString to QFileInfo anymore, and a few more QChar(int) fixes. Task-number: QTCREATORBUG-24098 Change-Id: I3326fc0701a9259c7bdd2d8c3025de0a4774f8aa Reviewed-by: hjk --- src/plugins/resourceeditor/qrceditor/resourcefile.cpp | 2 +- src/plugins/resourceeditor/resourcenode.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/plugins/resourceeditor') diff --git a/src/plugins/resourceeditor/qrceditor/resourcefile.cpp b/src/plugins/resourceeditor/qrceditor/resourcefile.cpp index cff7443c7f..85d9741e78 100644 --- a/src/plugins/resourceeditor/qrceditor/resourcefile.cpp +++ b/src/plugins/resourceeditor/qrceditor/resourcefile.cpp @@ -793,7 +793,7 @@ QVariant ResourceModel::data(const QModelIndex &index, int role) const if (iconFileExtension(path)) file->icon = QIcon(path); else - file->icon = Core::FileIconProvider::icon(path); + file->icon = Core::FileIconProvider::icon(QFileInfo(path)); } if (!file->icon.isNull()) result = file->icon; diff --git a/src/plugins/resourceeditor/resourcenode.cpp b/src/plugins/resourceeditor/resourcenode.cpp index 5a9e2aef6a..0792e84d4e 100644 --- a/src/plugins/resourceeditor/resourcenode.cpp +++ b/src/plugins/resourceeditor/resourcenode.cpp @@ -244,7 +244,7 @@ ResourceTopLevelNode::ResourceTopLevelNode(const FilePath &filePath, const QString &contents) : FolderNode(filePath) { - setIcon(FileIconProvider::icon(filePath.toString())); + setIcon(FileIconProvider::icon(filePath.toFileInfo())); setPriority(Node::DefaultFilePriority); setListInProject(true); setAddFileFilter("*.png; *.jpg; *.gif; *.svg; *.ico; *.qml; *.qml.ui"); -- cgit v1.2.1