diff options
| author | Jan Arve Saether <jan-arve.saether@digia.com> | 2014-08-28 12:30:10 +0200 |
|---|---|---|
| committer | Jan Arve Sæther <jan-arve.saether@digia.com> | 2014-09-17 11:34:55 +0200 |
| commit | bce19cb9063003af5924c643f6fc1416146b4242 (patch) | |
| tree | 2f266fd36478d3022e4588eed72fe5a8aba923ad /src/widgets/styles/qfusionstyle.cpp | |
| parent | 4f25bdd21ac5eaadcfaeea89bbfc0bf382cd862b (diff) | |
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>
Diffstat (limited to 'src/widgets/styles/qfusionstyle.cpp')
| -rw-r--r-- | src/widgets/styles/qfusionstyle.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/widgets/styles/qfusionstyle.cpp b/src/widgets/styles/qfusionstyle.cpp index a2b08f306c..782812d72c 100644 --- a/src/widgets/styles/qfusionstyle.cpp +++ b/src/widgets/styles/qfusionstyle.cpp @@ -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) { |