equal
deleted
inserted
replaced
803 weight = Normal; |
803 weight = Normal; |
804 } else { |
804 } else { |
805 resolve_mask |= QFont::WeightResolved | QFont::StyleResolved; |
805 resolve_mask |= QFont::WeightResolved | QFont::StyleResolved; |
806 } |
806 } |
807 |
807 |
|
808 if (italic) |
|
809 resolve_mask |= QFont::StyleResolved; |
|
810 |
808 d->request.family = family; |
811 d->request.family = family; |
809 d->request.pointSize = qreal(pointSize); |
812 d->request.pointSize = qreal(pointSize); |
810 d->request.pixelSize = -1; |
813 d->request.pixelSize = -1; |
811 d->request.weight = weight; |
814 d->request.weight = weight; |
812 d->request.style = italic ? QFont::StyleItalic : QFont::StyleNormal; |
815 d->request.style = italic ? QFont::StyleItalic : QFont::StyleNormal; |