Changeset 125 for trunk/src/gui/text

Timestamp:

Aug 25, 2009, 4:54:23 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Added QFontEnginePMFT that makes use of FreeType to render fonts and enabled by default (no proper font matching yet, HELV.PFB is always used so far).

Location:

trunk/src/gui/text

Files:

• qfontdatabase_pm.cpp (modified) (2 diffs)
• qfontengine.cpp (modified) (1 diff)
• qfontengine_p.h (modified) (1 diff)
• qfontengine_pm.cpp (added)
• qfontengine_pm_p.h (added)
• text.pri (modified) (2 diffs)

trunk/src/gui/text/qfontdatabase_pm.cpp

@@ -43 +43 @@
 
 #include "qabstractfileengine.h"
+
+
 
 QT_BEGIN_NAMESPACE
@@ -94 +96 @@
         } else {
             // @todo initializeDb() and stuff, get the engine
+
+
         }
         if (!fe) {

trunk/src/gui/text/qfontengine.cpp

@@ -781 +781 @@
 }
 
-#if defined(Q_WS_WIN) || defined(Q_WS_X11) || defined(Q_WS_QWS)
+#if defined(Q_WS_WIN) || defined(Q_WS_X11) || defined(Q_WS_QWS)
 static inline QFixed kerning(int left, int right, const QFontEngine::KernPair *pairs, int numPairs)
 {

trunk/src/gui/text/qfontengine_p.h

@@ -232 +232 @@
     mutable HB_FontRec hbFont;
     mutable HB_Face hbFace;
-#if defined(Q_WS_WIN) || defined(Q_WS_X11) || defined(Q_WS_QWS)
+#if defined(Q_WS_WIN) || defined(Q_WS_X11) || defined(Q_WS_QWS)
     struct KernPair {
         uint left_right;

trunk/src/gui/text/text.pri

@@ -77 +77 @@
 
 os2 {
+
+
+
         SOURCES += \
-                text/qfont_pm.cpp
+                text/qfont_pm.cpp \
+                text/qfontengine_pm.cpp \
+                text/qfontengine_ft.cpp
 }
 
@@ -114 +119 @@
 contains(QT_CONFIG, freetype) {
     SOURCES += \
-        ../3rdparty/freetype/builds/unix/ftsystem.c \
-        ../3rdparty/freetype/src/base/ftbase.c \
-        ../3rdparty/freetype/src/base/ftbbox.c \
-        ../3rdparty/freetype/src/base/ftdebug.c \
-        ../3rdparty/freetype/src/base/ftglyph.c \
-        ../3rdparty/freetype/src/base/ftinit.c \
-        ../3rdparty/freetype/src/base/ftmm.c \
-        ../3rdparty/freetype/src/base/fttype1.c \
-          ../3rdparty/freetype/src/base/ftbitmap.c\
-        ../3rdparty/freetype/src/bdf/bdf.c \
-        ../3rdparty/freetype/src/cache/ftcache.c \
-        ../3rdparty/freetype/src/cff/cff.c \
-        ../3rdparty/freetype/src/cid/type1cid.c \
-        ../3rdparty/freetype/src/gzip/ftgzip.c \
-        ../3rdparty/freetype/src/pcf/pcf.c \
-        ../3rdparty/freetype/src/pfr/pfr.c \
-        ../3rdparty/freetype/src/psaux/psaux.c \
-        ../3rdparty/freetype/src/pshinter/pshinter.c \
-        ../3rdparty/freetype/src/psnames/psmodule.c \
-        ../3rdparty/freetype/src/raster/raster.c \
-        ../3rdparty/freetype/src/sfnt/sfnt.c \
-        ../3rdparty/freetype/src/smooth/smooth.c \
-        ../3rdparty/freetype/src/truetype/truetype.c \
-        ../3rdparty/freetype/src/type1/type1.c \
-        ../3rdparty/freetype/src/type42/type42.c \
-        ../3rdparty/freetype/src/winfonts/winfnt.c \
-        ../3rdparty/freetype/src/lzw/ftlzw.c\
-          ../3rdparty/freetype/src/otvalid/otvalid.c\
-          ../3rdparty/freetype/src/otvalid/otvbase.c\
-          ../3rdparty/freetype/src/otvalid/otvgdef.c\
-          ../3rdparty/freetype/src/otvalid/otvjstf.c\
-          ../3rdparty/freetype/src/otvalid/otvcommn.c\
-          ../3rdparty/freetype/src/otvalid/otvgpos.c\
-          ../3rdparty/freetype/src/otvalid/otvgsub.c\
-          ../3rdparty/freetype/src/otvalid/otvmod.c\
-          ../3rdparty/freetype/src/autofit/afangles.c\
-          ../3rdparty/freetype/src/autofit/afglobal.c\
-          ../3rdparty/freetype/src/autofit/aflatin.c\
-          ../3rdparty/freetype/src/autofit/afmodule.c\
-          ../3rdparty/freetype/src/autofit/afdummy.c\
-          ../3rdparty/freetype/src/autofit/afhints.c\
-          ../3rdparty/freetype/src/autofit/afloader.c\
-          ../3rdparty/freetype/src/autofit/autofit.c
+        ../3rdparty/freetype/src/base/ftbase.c \
+        ../3rdparty/freetype/src/base/ftbbox.c \
+        ../3rdparty/freetype/src/base/ftdebug.c \
+        ../3rdparty/freetype/src/base/ftglyph.c \
+        ../3rdparty/freetype/src/base/ftinit.c \
+        ../3rdparty/freetype/src/base/ftmm.c \
+        ../3rdparty/freetype/src/base/fttype1.c \
+        ../3rdparty/freetype/src/base/ftbitmap.c\
+        ../3rdparty/freetype/src/bdf/bdf.c \
+        ../3rdparty/freetype/src/cache/ftcache.c \
+        ../3rdparty/freetype/src/cff/cff.c \
+        ../3rdparty/freetype/src/cid/type1cid.c \
+        ../3rdparty/freetype/src/gzip/ftgzip.c \
+        ../3rdparty/freetype/src/pcf/pcf.c \
+        ../3rdparty/freetype/src/pfr/pfr.c \
+        ../3rdparty/freetype/src/psaux/psaux.c \
+        ../3rdparty/freetype/src/pshinter/pshinter.c \
+        ../3rdparty/freetype/src/psnames/psmodule.c \
+        ../3rdparty/freetype/src/raster/raster.c \
+        ../3rdparty/freetype/src/sfnt/sfnt.c \
+        ../3rdparty/freetype/src/smooth/smooth.c \
+        ../3rdparty/freetype/src/truetype/truetype.c \
+        ../3rdparty/freetype/src/type1/type1.c \
+        ../3rdparty/freetype/src/type42/type42.c \
+        ../3rdparty/freetype/src/winfonts/winfnt.c \
+        ../3rdparty/freetype/src/lzw/ftlzw.c\
+        ../3rdparty/freetype/src/otvalid/otvalid.c\
+        ../3rdparty/freetype/src/otvalid/otvbase.c\
+        ../3rdparty/freetype/src/otvalid/otvgdef.c\
+        ../3rdparty/freetype/src/otvalid/otvjstf.c\
+        ../3rdparty/freetype/src/otvalid/otvcommn.c\
+        ../3rdparty/freetype/src/otvalid/otvgpos.c\
+        ../3rdparty/freetype/src/otvalid/otvgsub.c\
+        ../3rdparty/freetype/src/otvalid/otvmod.c\
+        ../3rdparty/freetype/src/autofit/afangles.c\
+        ../3rdparty/freetype/src/autofit/afglobal.c\
+        ../3rdparty/freetype/src/autofit/aflatin.c\
+        ../3rdparty/freetype/src/autofit/afmodule.c\
+        ../3rdparty/freetype/src/autofit/afdummy.c\
+        ../3rdparty/freetype/src/autofit/afhints.c\
+        ../3rdparty/freetype/src/autofit/afloader.c\
+        ../3rdparty/freetype/src/autofit/autofit.c
 
     INCLUDEPATH += \
-        ../3rdparty/freetype/src \
-        ../3rdparty/freetype/include \
-        ../3rdparty/freetype/builds/unix
+        ../3rdparty/freetype/src \
+        ../3rdparty/freetype/include
 
-    DEFINES += FT2_BUILD_LIBRARY FT_CONFIG_OPTION_SYSTEM_ZLIB
-    
+    DEFINES += FT2_BUILD_LIBRARY
+
+    os2 {
+        SOURCES += ../3rdparty/freetype/src/base/ftsystem.c
+        INCLUDEPATH += ../3rdparty/freetype/builds/os2
+    } else {
+        SOURCES += ../3rdparty/freetype/builds/unix/ftsystem.c
+        INCLUDEPATH += ../3rdparty/freetype/builds/unix
+        DEFINES += FT_CONFIG_OPTION_SYSTEM_ZLIB
+    }
+
     embedded:CONFIG += opentype
 } else:contains(QT_CONFIG, system-freetype) {