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

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/text.pri (modified) (4 diffs)

trunk/src/gui/text/text.pri

@@ -38 +38 @@
         text/qzipreader_p.h \
         text/qzipwriter_p.h \
-        text/qtextodfwriter_p.h
+        text/qtextodfwriter_p.h \
+        text/qstatictext_p.h \
+        text/qstatictext.h
 
 SOURCES += \
@@ -67 +69 @@
         text/qcssparser.cpp \
         text/qzip.cpp \
-        text/qtextodfwriter.cpp
+        text/qtextodfwriter.cpp \
+        text/qstatictext.cpp
 
 win32 {
@@ -146 +149 @@
         ../3rdparty/freetype/src/base/ftmm.c \
         ../3rdparty/freetype/src/base/fttype1.c \
-          ../3rdparty/freetype/src/base/ftbitmap.c\
+        ../3rdparty/freetype/src/base/ftsynth.c \
+        ../3rdparty/freetype/src/base/ftbitmap.c \
         ../3rdparty/freetype/src/bdf/bdf.c \
         ../3rdparty/freetype/src/cache/ftcache.c \
@@ -211 +215 @@
     include($$QT_SOURCE_TREE/config.tests/unix/freetype/freetype.pri)
     LIBS_PRIVATE += -lfreetype
-} else {
-    DEFINES *= QT_NO_FREETYPE
 }