diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-24 07:51:22 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-24 07:51:22 (GMT) |
| commit | 52922773b5d2c55ce5edee9253c0badfc2001d2c (patch) | |
| tree | 32c00b0d0ac82c3b010763b5284dd505dd83d73a /src/gui/styles/qgtkstyle.cpp | |
| parent | cf89e30f6885efb4b63f01e4459f8b277cb52113 (diff) | |
| parent | 25fd8e7a48f4cc2bd3a5d52ac8f90a6691d65c05 (diff) | |
| download | Qt-52922773b5d2c55ce5edee9253c0badfc2001d2c.zip Qt-52922773b5d2c55ce5edee9253c0badfc2001d2c.tar.gz Qt-52922773b5d2c55ce5edee9253c0badfc2001d2c.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui/styles/qgtkstyle.cpp')
| -rw-r--r-- | src/gui/styles/qgtkstyle.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/styles/qgtkstyle.cpp b/src/gui/styles/qgtkstyle.cpp index 5566cc6..b32c55b 100644 --- a/src/gui/styles/qgtkstyle.cpp +++ b/src/gui/styles/qgtkstyle.cpp @@ -1368,7 +1368,7 @@ void QGtkStyle::drawComplexControl(ComplexControl control, const QStyleOptionCom else { gtkCachedPainter.paintFlatBox(gtkEntry, "entry_bg", contentRect, option->state & State_Enabled ? GTK_STATE_NORMAL : GTK_STATE_INSENSITIVE, - GTK_SHADOW_NONE, style, entryPath + QString::number(focus)); + GTK_SHADOW_NONE, gtkCombo->style, entryPath + QString::number(focus)); } gtkCachedPainter.paintShadow(gtkEntry, comboBox->editable ? "entry" : "frame", frameRect, frameState, |