equal
deleted
inserted
replaced
94 { |
94 { |
95 QFont rc = m_familyComboBox->currentFont(); |
95 QFont rc = m_familyComboBox->currentFont(); |
96 const QString family = rc.family(); |
96 const QString family = rc.family(); |
97 rc.setPointSize(pointSize()); |
97 rc.setPointSize(pointSize()); |
98 const QString styleDescription = styleString(); |
98 const QString styleDescription = styleString(); |
99 rc.setItalic(m_fontDatabase.italic(family, styleDescription)); |
99 if (styleDescription.contains(QLatin1String("Italic"))) |
100 |
100 rc.setStyle(QFont::StyleItalic); |
|
101 else if (styleDescription.contains(QLatin1String("Oblique"))) |
|
102 rc.setStyle(QFont::StyleOblique); |
|
103 else |
|
104 rc.setStyle(QFont::StyleNormal); |
101 rc.setBold(m_fontDatabase.bold(family, styleDescription)); |
105 rc.setBold(m_fontDatabase.bold(family, styleDescription)); |
102 |
106 |
103 // Weight < 0 asserts... |
107 // Weight < 0 asserts... |
104 const int weight = m_fontDatabase.weight(family, styleDescription); |
108 const int weight = m_fontDatabase.weight(family, styleDescription); |
105 if (weight >= 0) |
109 if (weight >= 0) |