Changeset 561 for trunk/src/gui/text/text.pri

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

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

trunk/src/gui/text/text.pri

@@ -89 +89 @@
         HEADERS += \
                 text/qfontengine_x11_p.h \
+                text/qfontdatabase_x11.cpp \
                 text/qfontengine_ft_p.h
         SOURCES += \
@@ -117 +118 @@
 }
 
+symbian {
+        SOURCES += \
+                text/qfont_s60.cpp
+        contains(QT_CONFIG, freetype) {
+                SOURCES += \
+                        text/qfontengine_ft.cpp
+                HEADERS += \
+                        text/qfontengine_ft_p.h
+                DEFINES += \
+                        QT_NO_FONTCONFIG
+        } else {
+                SOURCES += \
+                        text/qfontengine_s60.cpp
+                HEADERS += \
+                        text/qfontengine_s60_p.h
+                LIBS += -lfntstr -lecom
+        }
+}
+
 contains(QT_CONFIG, freetype) {
     SOURCES += \
-        ../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
-
-    DEFINES += FT2_BUILD_LIBRARY
-
-    os2 {
-        SOURCES += ../3rdparty/freetype/src/base/ftsystem.c
-        INCLUDEPATH += ../3rdparty/freetype/builds/os2
+        ../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
+
+    symbian {
+        SOURCES += \
+            ../3rdparty/freetype/src/base/ftsystem.c
+        DEFINES += FT_CONFIG_OPTION_SYSTEM_ZLIB
+    } 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
+        SOURCES += \
+            ../3rdparty/freetype/builds/unix/ftsystem.c
+        INCLUDEPATH += \
+            ../3rdparty/freetype/builds/unix
         DEFINES += FT_CONFIG_OPTION_SYSTEM_ZLIB
     }
 
+    INCLUDEPATH += \
+        ../3rdparty/freetype/src \
+        ../3rdparty/freetype/include
+
+    DEFINES += FT2_BUILD_LIBRARY
+    
     embedded:CONFIG += opentype
 } else:contains(QT_CONFIG, system-freetype) {
@@ -182 +210 @@
     # pull in the proper freetype2 include directory
     include($$QT_SOURCE_TREE/config.tests/unix/freetype/freetype.pri)
-    LIBS += -lfreetype
+    LIBS_PRIVATE += -lfreetype
 } else {
     DEFINES *= QT_NO_FREETYPE