equal
deleted
inserted
replaced
252 updateFont(font); |
252 updateFont(font); |
253 } |
253 } |
254 |
254 |
255 void QGraphicsWidgetPrivate::resolveFont(uint inheritedMask) |
255 void QGraphicsWidgetPrivate::resolveFont(uint inheritedMask) |
256 { |
256 { |
|
257 Q_Q(QGraphicsWidget); |
257 inheritedFontResolveMask = inheritedMask; |
258 inheritedFontResolveMask = inheritedMask; |
|
259 if (QGraphicsWidget *p = q->parentWidget()) |
|
260 inheritedFontResolveMask |= p->d_func()->inheritedFontResolveMask; |
258 QFont naturalFont = naturalWidgetFont(); |
261 QFont naturalFont = naturalWidgetFont(); |
259 QFont resolvedFont = font.resolve(naturalFont); |
262 QFont resolvedFont = font.resolve(naturalFont); |
260 updateFont(resolvedFont); |
263 updateFont(resolvedFont); |
261 } |
264 } |
262 |
265 |