Utils: Unify the different Bookmark icons

The variant in Bookmarks was left aligned, which is obsolete due to the
textmark overview tooltip. Bookmarks and Help now use the same icon which
is in Utils.

Change-Id: I0f7899de2f7a8803aa8493659d2991ac13739144
Reviewed-by: David Schulz <david.schulz@qt.io>

5 files changed, 2 insertions, 10 deletions

diff --git a/src/plugins/bookmarks/bookmarkmanager.cpp b/src/plugins/bookmarks/bookmarkmanager.cpp
index b2c69e9e9f..e2464fd240 100644
--- a/src/plugins/bookmarks/bookmarkmanager.cpp
+++ b/src/plugins/bookmarks/bookmarkmanager.cpp
@@ -42,6 +42,7 @@
 #include <utils/checkablemessagebox.h>
 #include <utils/theme/theme.h>
 #include <utils/dropsupport.h>
+#include <utils/utilsicons.h>
 
 #include <QAction>
 #include <QContextMenuEvent>
@@ -319,8 +320,7 @@ void BookmarkView::gotoBookmark(const QModelIndex &index)
 ////
 
 BookmarkManager::BookmarkManager() :
-    m_bookmarkIcon(Utils::Icon({{QLatin1String(":/bookmarks/images/bookmark.png"),
-                                 Theme::Bookmarks_TextMarkColor}}, Icon::Tint).pixmap()),
+    m_bookmarkIcon(Utils::Icons::BOOKMARK_TEXTEDITOR.pixmap()),
     m_selectionModel(new QItemSelectionModel(this, this))
 {
     connect(ICore::instance(), &ICore::contextChanged,
diff --git a/src/plugins/bookmarks/bookmarks.pro b/src/plugins/bookmarks/bookmarks.pro
index f6d176aeec..1445aa9fa7 100644
--- a/src/plugins/bookmarks/bookmarks.pro
+++ b/src/plugins/bookmarks/bookmarks.pro
@@ -8,5 +8,3 @@ HEADERS += bookmarksplugin.h \
 SOURCES += bookmarksplugin.cpp \
            bookmark.cpp \
            bookmarkmanager.cpp
-
-RESOURCES += bookmarks.qrc
diff --git a/src/plugins/bookmarks/bookmarks.qrc b/src/plugins/bookmarks/bookmarks.qrc
deleted file mode 100644
index 764b398555..0000000000
--- a/src/plugins/bookmarks/bookmarks.qrc
+++ /dev/null
@@ -1,6 +0,0 @@
-<RCC>
-    <qresource prefix="/bookmarks" >
-        <file>images/bookmark.png</file>
-        <file>images/bookmark@2x.png</file>
-    </qresource>
-</RCC>
diff --git a/src/plugins/bookmarks/images/bookmark.png b/src/plugins/bookmarks/images/bookmark.png
deleted file mode 100644
index 05f4eec541..0000000000
--- a/src/plugins/bookmarks/images/bookmark.png
+++ /dev/null
diff --git a/src/plugins/bookmarks/images/bookmark@2x.png b/src/plugins/bookmarks/images/bookmark@2x.png
deleted file mode 100644
index 903acddbd8..0000000000
--- a/src/plugins/bookmarks/images/bookmark@2x.png
+++ /dev/null