diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-11-20 16:08:08 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-11-20 15:43:25 +0000 |
| commit | f534624fce9a5f1f3d1573c6800cbec5dec8edbf (patch) | |
| tree | 8c80de8bc11fdbab6fd4986a9e966eb23839184a /src/plugins/resourceeditor | |
| parent | 01331893adf91a3bb96152b65dc113fd57cb8ed2 (diff) | |
| download | qt-creator-f534624fce9a5f1f3d1573c6800cbec5dec8edbf.tar.gz | |
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 <hjk@qt.io>
Diffstat (limited to 'src/plugins/resourceeditor')
| -rw-r--r-- | src/plugins/resourceeditor/qrceditor/resourcefile.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/resourceeditor/resourcenode.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
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"); |