diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2010-09-02 17:32:28 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2010-09-02 17:32:28 +0200 |
| commit | a4c70a0ffdba0c84664944645b12778f5142320b (patch) | |
| tree | 3087d9447698506dfa61d4f5b6b190f1b15f5616 /src/bookmarks/bookmarkstreemodel.cpp | |
| parent | Code Review. (diff) | |
| parent | Fix compile again ... (diff) | |
| download | rekonq-a4c70a0ffdba0c84664944645b12778f5142320b.tar.xz | |
Merge commit 'refs/merge-requests/197' of git://gitorious.org/rekonq/mainline into m197
Conflicts:
src/bookmarks/bookmarkprovider.h
I also changed a iconmanager header inclusion :)
Diffstat (limited to 'src/bookmarks/bookmarkstreemodel.cpp')
| -rw-r--r-- | src/bookmarks/bookmarkstreemodel.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/bookmarks/bookmarkstreemodel.cpp b/src/bookmarks/bookmarkstreemodel.cpp index 7a1193e4..796208a9 100644 --- a/src/bookmarks/bookmarkstreemodel.cpp +++ b/src/bookmarks/bookmarkstreemodel.cpp @@ -70,7 +70,10 @@ QVariant BtmItem::data(int role) const // return KIcon(m_kbm.icon()); // but I cannot let it work :( // I really cannot understand how let this work properly... - return Application::iconManager()->iconForUrl(KUrl(m_kbm.url())); + if (m_kbm.isGroup() || m_kbm.isSeparator()) + return KIcon(m_kbm.icon()); + else + return Application::iconManager()->iconForUrl(KUrl(m_kbm.url())); } if (role == Qt::UserRole) |