Merge remote-tracking branch 'origin/4.9'

Change-Id: If36258b8e572b5c7875433a31a836e4f06e27286
This commit is contained in:
Eike Ziller
2019-03-21 11:28:21 +01:00
47 changed files with 2860 additions and 1312 deletions

View File

@@ -131,7 +131,7 @@ public:
palette.setCurrentColorGroup(QPalette::Active);
bool selected = opt.state & QStyle::State_Selected;
QColor backgroundColor = selected ? palette.highlight().color()
: palette.background().color();
: palette.window().color();
painter->setBrush(backgroundColor);
painter->drawRect(0, opt.rect.top(), opt.rect.width() + opt.rect.left(), opt.rect.height());