Fusion Style: Workaround to get combo box item style from QtQuick Ctrls

This is to align the behaviour with how QGtkStyles behavior is.

Change-Id: Ic85d96cf4a4ab30974b25936de6d5b98e65dd2f3
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
bb10
Jan Arve Saether 2014-08-28 12:30:10 +02:00 committed by Jan Arve Sæther
parent 4f25bdd21a
commit bce19cb906
1 changed files with 2 additions and 1 deletions

View File

@ -1545,7 +1545,8 @@ void QFusionStyle::drawControl(ControlElement element, const QStyleOption *optio
bool ignoreCheckMark = false;
int checkcol = qMax(menuItem->maxIconWidth, 20);
if (qobject_cast<const QComboBox*>(widget))
if (qobject_cast<const QComboBox*>(widget) ||
(option->styleObject && option->styleObject->property("_q_isComboBoxPopupItem").toBool()))
ignoreCheckMark = true; //ignore the checkmarks provided by the QComboMenuDelegate
if (!ignoreCheckMark) {