diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2016-04-20 14:58:48 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2016-04-20 14:58:48 +0200 |
| commit | ee8bf341c6f64096c6ccfeefd3b6b8a85fe91c0b (patch) | |
| tree | 4dd8b097d0d2acc17f1a13e0e99debfc92b36466 /src/plugins/bookmarks | |
| parent | 0eeee15a887a8180c1c28dc9f4929b066e096136 (diff) | |
| parent | 5dc690f234ec7bb5dcdb11a610a4ecbee6dc4d64 (diff) | |
Merge remote-tracking branch 'origin/4.0'
Conflicts:
src/plugins/projectexplorer/session.cpp
src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
Change-Id: I6946139f5e5fa3a9cdbb322fd50be248e2c0133f
Diffstat (limited to 'src/plugins/bookmarks')
| -rw-r--r-- | src/plugins/bookmarks/bookmarkmanager.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/bookmarks/bookmarks.qrc | 1 | ||||
| -rw-r--r-- | src/plugins/bookmarks/images/bookmark.png | bin | 913 -> 131 bytes | |||
| -rw-r--r-- | src/plugins/bookmarks/images/bookmark@2x.png | bin | 0 -> 162 bytes |
4 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/bookmarks/bookmarkmanager.cpp b/src/plugins/bookmarks/bookmarkmanager.cpp index ec9c2f7f49c..ee92b9ab8e1 100644 --- a/src/plugins/bookmarks/bookmarkmanager.cpp +++ b/src/plugins/bookmarks/bookmarkmanager.cpp @@ -37,6 +37,7 @@ #include <projectexplorer/projectexplorer.h> #include <projectexplorer/session.h> #include <texteditor/texteditor.h> +#include <utils/icon.h> #include <utils/tooltip/tooltip.h> #include <utils/qtcassert.h> #include <utils/checkablemessagebox.h> @@ -318,7 +319,8 @@ void BookmarkView::gotoBookmark(const QModelIndex &index) //// BookmarkManager::BookmarkManager() : - m_bookmarkIcon(QLatin1String(":/bookmarks/images/bookmark.png")), + m_bookmarkIcon(Utils::Icon({{QLatin1String(":/bookmarks/images/bookmark.png"), + Theme::Bookmarks_TextMarkColor}}, Icon::Tint).pixmap()), m_selectionModel(new QItemSelectionModel(this, this)) { connect(ICore::instance(), &ICore::contextChanged, diff --git a/src/plugins/bookmarks/bookmarks.qrc b/src/plugins/bookmarks/bookmarks.qrc index f0a890bf374..764b398555c 100644 --- a/src/plugins/bookmarks/bookmarks.qrc +++ b/src/plugins/bookmarks/bookmarks.qrc @@ -1,5 +1,6 @@ <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 Binary files differindex 7b2e5fd0cef..05f4eec5413 100644 --- a/src/plugins/bookmarks/images/bookmark.png +++ b/src/plugins/bookmarks/images/bookmark.png diff --git a/src/plugins/bookmarks/images/bookmark@2x.png b/src/plugins/bookmarks/images/bookmark@2x.png Binary files differnew file mode 100644 index 00000000000..903acddbd8a --- /dev/null +++ b/src/plugins/bookmarks/images/bookmark@2x.png |
