Changeset 846 for trunk/src/gui/text/qfont_s60.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)
• src/gui/text/qfont_s60.cpp (modified) (4 diffs)

trunk/src/gui/text/qfont_s60.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])
@@ -41 +41 @@
 
 #include "qfont.h"
-#include "qt_s60_p.h"
-#include "qpixmap_s60_p.h"
+#include "qfont_p.h"
+#include <private/qt_s60_p.h>
+#include <private/qpixmap_s60_p.h>
 #include "qmutex.h"
 
 QT_BEGIN_NAMESPACE
 
-#if 1
 #ifdef QT_NO_FREETYPE
 Q_GLOBAL_STATIC(QMutex, lastResortFamilyMutex);
+
+
+
+
+
+
 #endif // QT_NO_FREETYPE
+
+
+
+
+
+
+
+
+
+
 
 QString QFont::lastResortFamily() const
@@ -71 +87 @@
     }
     return family;
-#else
+#else
     // For the FreeType case we just hard code the face name, since otherwise on
     // East Asian systems we may get a name for a stroke based (non-ttf) font.
@@ -83 +99 @@
 #endif // QT_NO_FREETYPE
 }
-#else // 0
-QString QFont::lastResortFamily() const
-{
-    return QLatin1String("Series 60 Sans");
-}
-#endif // 0
 
 QString QFont::defaultFamily() const
 {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     return lastResortFamily();
 }