Changeset 769 for trunk/src/gui/text/qfont.cpp

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

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

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/text/qfont.cpp (modified) (3 diffs)

trunk/src/gui/text/qfont.cpp

@@ -646 +646 @@
     Returns the name of the font within the underlying window system.
 
-    Only on X11 when Qt was built without FontConfig support the XLFD (X Logical Font Description)
-    is returned; otherwise an empty string.
+    On X11, this function will return an empty string if Qt is built with
+    FontConfig support; otherwise the XLFD (X Logical Font Description) is
+    returned.
 
     Using the return value of this function is usually \e not \e
@@ -820 +821 @@
         resolve_mask |= QFont::WeightResolved | QFont::StyleResolved;
     }
+
+
+
 
     d->request.family = family;
@@ -2641 +2645 @@
 QFontCache::~QFontCache()
 {
+
     {
         EngineDataCache::ConstIterator it = engineDataCache.constBegin(),