Changeset 846 for trunk/src/gui/text/qfont.h

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)
• src/gui/text/qfont.h (modified) (3 diffs)

trunk/src/gui/text/qfont.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -73 +73 @@
         OldEnglish, Decorative = OldEnglish,
         System,
-        AnyStyle
+        AnyStyle,
+        Cursive,
+        Monospace,
+        Fantasy
     };
 
     enum StyleStrategy {
-        PreferDefault    = 0x0001,
-        PreferBitmap     = 0x0002,
-        PreferDevice     = 0x0004,
-        PreferOutline    = 0x0008,
-        ForceOutline     = 0x0010,
-        PreferMatch      = 0x0020,
-        PreferQuality    = 0x0040,
-        PreferAntialias  = 0x0080,
-        NoAntialias      = 0x0100,
-        OpenGLCompatible = 0x0200,
-        NoFontMerging    = 0x8000
+        PreferDefault       = 0x0001,
+        PreferBitmap        = 0x0002,
+        PreferDevice        = 0x0004,
+        PreferOutline       = 0x0008,
+        ForceOutline        = 0x0010,
+        PreferMatch         = 0x0020,
+        PreferQuality       = 0x0040,
+        PreferAntialias     = 0x0080,
+        NoAntialias         = 0x0100,
+        OpenGLCompatible    = 0x0200,
+        ForceIntegerMetrics = 0x0400,
+        NoFontMerging       = 0x8000
     };
 
@@ -292 +296 @@
     friend class QFontInfo;
     friend class QPainter;
+    friend class QPainterPrivate;
     friend class QPSPrintEngineFont;
     friend class QApplication;