Merge remote-tracking branch 'origin/4.9'

Change-Id: I57c5c1ce5c4a86815a84b95ddc826a981afdb673
This commit is contained in:
Eike Ziller
2019-03-27 11:42:04 +01:00
21 changed files with 2745 additions and 1173 deletions

View File

@@ -608,9 +608,10 @@ void ManhattanStyle::drawPrimitive(PrimitiveElement element, const QStyleOption
case PE_IndicatorArrowDown:
case PE_IndicatorArrowRight:
case PE_IndicatorArrowLeft:
{
if (qobject_cast<const QMenu *>(widget)) // leave submenu arrow painting alone
QProxyStyle::drawPrimitive(element, option, painter, widget);
else
StyleHelper::drawArrow(element, painter, option);
}
break;
default: