diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-15 18:35:43 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-15 18:35:43 (GMT) |
| commit | 71d94529a3cf894fa11954463dc8658aed2a04fc (patch) | |
| tree | 1f9f6b2cf09b7ab317f430d3f7e65f1ea2737b3b /src/gui | |
| parent | ab124ac4c66cbfb22e8f25b5e77c4e7564acdd89 (diff) | |
| parent | 13240f5f0cdb08ec4dbb80482bd0d7d95cb6b530 (diff) | |
| download | Qt-71d94529a3cf894fa11954463dc8658aed2a04fc.zip Qt-71d94529a3cf894fa11954463dc8658aed2a04fc.tar.gz Qt-71d94529a3cf894fa11954463dc8658aed2a04fc.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Doc: Added placeholder pages for new examples and updated the overviews.
Fixes: Cosmetic fix for maemo spin box
Adding texture glyph cache default.
Diffstat (limited to 'src/gui')
| -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 abb9e1e..211f4ce 100644 --- a/src/gui/styles/qgtkstyle.cpp +++ b/src/gui/styles/qgtkstyle.cpp @@ -1377,7 +1377,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, gtkCombo->style, entryPath + QString::number(focus)); + GTK_SHADOW_NONE, gtkEntry->style, entryPath + QString::number(focus)); } gtkCachedPainter.paintShadow(gtkEntry, comboBox->editable ? "entry" : "frame", frameRect, frameState, |