diff options
| -rw-r--r-- | src/kernel/qstyle.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/kernel/qstyle.cpp b/src/kernel/qstyle.cpp index 55aba9e..e7d3fa5 100644 --- a/src/kernel/qstyle.cpp +++ b/src/kernel/qstyle.cpp @@ -2422,7 +2422,7 @@ void QStyle::drawPrimitive( PrimitiveElement pe, } } - QStyleControlElementData ceData = populateControlElementDataFromWidget(widget, QStyleOption()); + QStyleControlElementData ceData = populateControlElementDataFromWidget(widget, opt); drawPrimitive(pe, p, ceData, getControlElementFlagsForObject(widget, ceData.widgetObjectTypes, QStyleOption()), r, cg, flags, opt); } @@ -2485,7 +2485,7 @@ void QStyle::drawComplexControl( ComplexControl control, } #endif - QStyleControlElementData ceData = populateControlElementDataFromWidget(widget, QStyleOption()); + QStyleControlElementData ceData = populateControlElementDataFromWidget(widget, opt); drawComplexControl(control, p, ceData, getControlElementFlagsForObject(widget, ceData.widgetObjectTypes, QStyleOption()), r, cg, flags, controls, active, opt, widget); } @@ -2495,7 +2495,7 @@ void QStyle::drawComplexControlMask( ComplexControl control, const QRect &r, const QStyleOption& opt ) const { - QStyleControlElementData ceData = populateControlElementDataFromWidget(widget, QStyleOption()); + QStyleControlElementData ceData = populateControlElementDataFromWidget(widget, opt); drawComplexControlMask(control, p, ceData, getControlElementFlagsForObject(widget, ceData.widgetObjectTypes, QStyleOption()), r, opt, widget); } @@ -2511,7 +2511,7 @@ QRect QStyle::querySubControlMetrics( ComplexControl control, } #endif - QStyleControlElementData ceData = populateControlElementDataFromWidget(widget, QStyleOption(), false); + QStyleControlElementData ceData = populateControlElementDataFromWidget(widget, opt, false); return querySubControlMetrics(control, ceData, getControlElementFlagsForObject(widget, ceData.widgetObjectTypes, QStyleOption()), sc, opt, widget); } @@ -2544,19 +2544,19 @@ QSize QStyle::sizeFromContents(ContentsType contents, } #endif - QStyleControlElementData ceData = populateControlElementDataFromWidget(widget, QStyleOption()); + QStyleControlElementData ceData = populateControlElementDataFromWidget(widget, opt); return sizeFromContents(contents, ceData, getControlElementFlagsForObject(widget, ceData.widgetObjectTypes, QStyleOption()), contentsSize, opt, widget); } int QStyle::styleHint(StyleHint sh, const QWidget * w, const QStyleOption &so, QStyleHintReturn *shr) const { - QStyleControlElementData ceData = populateControlElementDataFromWidget(w, QStyleOption(), false); + QStyleControlElementData ceData = populateControlElementDataFromWidget(w, so, false); return styleHint(sh, ceData, getControlElementFlagsForObject(w, ceData.widgetObjectTypes, QStyleOption(), false), so, shr, w); } QPixmap QStyle::stylePixmap(StylePixmap sp, const QWidget *w, const QStyleOption &so) const { - QStyleControlElementData ceData = populateControlElementDataFromWidget(w, QStyleOption()); + QStyleControlElementData ceData = populateControlElementDataFromWidget(w, so); return stylePixmap(sp, ceData, getControlElementFlagsForObject(w, ceData.widgetObjectTypes, QStyleOption()), so, w); } |