diff options
author | Gabriel de Dietrich <gabriel.dedietrich@digia.com> | 2013-02-20 17:42:28 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-20 19:32:24 +0100 |
commit | 26bc4ab22e0784979e9606f799d118e67828e23d (patch) | |
tree | e862ef1bfdc5e5fa8b24fb120985ee744a4059f8 | |
parent | eff6dbb306956f099374e5a0c5942b9e91a81e71 (diff) |
Gtk Style: Workaround to get combo box item style from QtQuick Controls
Change-Id: I0f39269d08d58e0ee1f5b09b90e11ab1030a3932
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
-rw-r--r-- | src/widgets/styles/qgtkstyle.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/widgets/styles/qgtkstyle.cpp b/src/widgets/styles/qgtkstyle.cpp index 52c1e2376c..caa41db451 100644 --- a/src/widgets/styles/qgtkstyle.cpp +++ b/src/widgets/styles/qgtkstyle.cpp @@ -3173,7 +3173,8 @@ void QGtkStyle::drawControl(ControlElement element, #ifndef QT_NO_COMBOBOX - 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 #endif |