Merge remote-tracking branch 'origin/4.6'

Change-Id: I421af2d62994436782dab6d37e97622bd055ed44
This commit is contained in:
Eike Ziller
2018-03-05 09:28:34 +01:00
15 changed files with 82 additions and 33 deletions

View File

@@ -177,6 +177,8 @@ const Icon CLOSE_SPLIT_RIGHT({
const Icon FILTER({
{QLatin1String(":/utils/images/filtericon.png"), Theme::IconsBaseColor}});
const Icon LINK({
{QLatin1String(":/utils/images/linkicon.png"), Theme::PanelTextColorMid}}, Icon::Tint);
const Icon LINK_TOOLBAR({
{QLatin1String(":/utils/images/linkicon.png"), Theme::IconsBaseColor}});
const Icon WARNING({
{QLatin1String(":/utils/images/warningfill.png"), Theme::BackgroundColorNormal},