diff options
| author | axis <qt-info@nokia.com> | 2009-11-24 13:57:31 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-11-24 13:57:31 (GMT) |
| commit | 89f81333b1f499d829cc5eeac63f790840c6f574 (patch) | |
| tree | 79bdf0e62e51e6fbe6255082f4daf3afbbd5fff6 /src/gui/styles | |
| parent | bd2a3643c9796cc938c40c4d340d8cc5346992f4 (diff) | |
| parent | 4817debee23a72f44eedbb8f33b6b611b5161174 (diff) | |
| download | Qt-89f81333b1f499d829cc5eeac63f790840c6f574.zip Qt-89f81333b1f499d829cc5eeac63f790840c6f574.tar.gz Qt-89f81333b1f499d829cc5eeac63f790840c6f574.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-staging2
Diffstat (limited to 'src/gui/styles')
| -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, |