Changeset 846 for trunk/tools/shared/fontpanel/fontpanel.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• tools/shared/fontpanel/fontpanel.cpp (modified) (2 diffs)

trunk/tools/shared/fontpanel/fontpanel.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -97 +97 @@
     rc.setPointSize(pointSize());
     const QString styleDescription = styleString();
-    rc.setItalic(m_fontDatabase.italic(family, styleDescription));
-
+    if (styleDescription.contains(QLatin1String("Italic")))
+        rc.setStyle(QFont::StyleItalic);
+    else if (styleDescription.contains(QLatin1String("Oblique")))
+        rc.setStyle(QFont::StyleOblique);
+    else
+        rc.setStyle(QFont::StyleNormal);
     rc.setBold(m_fontDatabase.bold(family, styleDescription));