diff options
author | Hugues Delorme <delorme.hugues@fougsys.fr> | 2015-03-09 17:10:25 +0100 |
---|---|---|
committer | Hugues Delorme <delorme.hugues@fougsys.fr> | 2015-03-11 13:45:16 +0000 |
commit | 20a0b97e82e306e065a421488d66adbcb9fd543a (patch) | |
tree | 7ccdfa0b6d20190ad2c4a857e7616afe9b0ec513 /src/plugins/mercurial | |
parent | b1a71f7b9680df8f9e27eb6564d08c94b60796c1 (diff) | |
download | qt-creator-20a0b97e82e306e065a421488d66adbcb9fd543a.tar.gz |
Vcs: fix missing icons in SubmitFileModel
In SubmitFileModel, filetype icons are missing for not "overlaid" icons in
Core::FileIconProvider. This is fixed by ensuring valid file paths are passed
to QFileInfo. VcsBase::SubmitFileModel has now a "repositoryRoot" property
so it can constructs absolute file paths.
VcsBaseSubmitEditor::setFileModel() now relies on SubmitFileModel::repositoryRoot()
instead of passing this info as annex parameter.
Change-Id: Ie045c3a7b247a5b5d48d10aaaf67cb3fdcf9fa7e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/mercurial')
-rw-r--r-- | src/plugins/mercurial/commiteditor.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/mercurial/commiteditor.cpp b/src/plugins/mercurial/commiteditor.cpp index 724ce2d100..4ab9e4f5b7 100644 --- a/src/plugins/mercurial/commiteditor.cpp +++ b/src/plugins/mercurial/commiteditor.cpp @@ -64,6 +64,7 @@ void CommitEditor::setFields(const QFileInfo &repositoryRoot, const QString &bra mercurialWidget->setFields(repositoryRoot.absoluteFilePath(), branch, userName, email); fileModel = new SubmitFileModel(this); + fileModel->setRepositoryRoot(repositoryRoot.absoluteFilePath()); QStringList shouldTrack; @@ -74,8 +75,7 @@ void CommitEditor::setFields(const QFileInfo &repositoryRoot, const QString &bra fileModel->addFile(item.file, item.flags, Unchecked); } - VcsBaseSubmitEditor::filterUntrackedFilesOfProject(repositoryRoot.absoluteFilePath(), - &shouldTrack); + VcsBaseSubmitEditor::filterUntrackedFilesOfProject(fileModel->repositoryRoot(), &shouldTrack); foreach (const QString &track, shouldTrack) { foreach (const VcsBaseClient::StatusItem &item, repoStatus) { @@ -84,7 +84,7 @@ void CommitEditor::setFields(const QFileInfo &repositoryRoot, const QString &bra } } - setFileModel(fileModel, repositoryRoot.absoluteFilePath()); + setFileModel(fileModel); } QString CommitEditor::committerInfo() |