← Back to branch summary

~oif-team/ubuntu/natty/qt4-x11/xi2.1

« back to all changes in this revision

Viewing changes to src/gui/text/text.pri

  • Committer: Bazaar Package Importer
  • Author(s): Alessandro Ghersi
  • Date: 2009-11-02 18:30:08 UTC
  • mfrom: (1.2.2 upstream)
  • mto: (15.2.5 experimental)
  • mto: This revision was merged to the branch mainline in revision 88.
  • Revision ID: james.westby@ubuntu.com-20091102183008-b6a4gcs128mvfb3m
Tags: upstream-4.6.0~beta1
Import upstream version 4.6.0~beta1

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gui/text/text.pri
106
106
        DEFINES += QT_NO_FONTCONFIG
107
107
}
108
108
 
 
109
symbian {
 
110
        SOURCES += \
 
111
                text/qfont_s60.cpp
 
112
        contains(QT_CONFIG, freetype) {
 
113
                SOURCES += \
 
114
                        text/qfontengine_ft.cpp
 
115
                HEADERS += \
 
116
                        text/qfontengine_ft_p.h
 
117
                DEFINES += \
 
118
                        QT_NO_FONTCONFIG
 
119
        } else {
 
120
                SOURCES += \
 
121
                        text/qfontengine_s60.cpp
 
122
                HEADERS += \
 
123
                        text/qfontengine_s60_p.h
 
124
                LIBS += -lfntstr -lecom
 
125
        }
 
126
}
 
127
 
109
128
contains(QT_CONFIG, freetype) {
110
129
    SOURCES += \
111
 
        ../3rdparty/freetype/builds/unix/ftsystem.c \
112
130
        ../3rdparty/freetype/src/base/ftbase.c \
113
131
        ../3rdparty/freetype/src/base/ftbbox.c \
114
132
        ../3rdparty/freetype/src/base/ftdebug.c \
152
170
          ../3rdparty/freetype/src/autofit/afloader.c\
153
171
          ../3rdparty/freetype/src/autofit/autofit.c
154
172
 
 
173
    symbian {
 
174
        SOURCES += \
 
175
            ../3rdparty/freetype/src/base/ftsystem.c
 
176
    } else {
 
177
        SOURCES += \
 
178
            ../3rdparty/freetype/builds/unix/ftsystem.c
 
179
        INCLUDEPATH += \
 
180
            ../3rdparty/freetype/builds/unix
 
181
    }
 
182
 
155
183
    INCLUDEPATH += \
156
184
        ../3rdparty/freetype/src \
157
 
        ../3rdparty/freetype/include \
158
 
        ../3rdparty/freetype/builds/unix
 
185
        ../3rdparty/freetype/include
159
186
 
160
187
    DEFINES += FT2_BUILD_LIBRARY FT_CONFIG_OPTION_SYSTEM_ZLIB
161
188
    
164
191
    embedded:CONFIG += opentype
165
192
    # pull in the proper freetype2 include directory
166
193
    include($$QT_SOURCE_TREE/config.tests/unix/freetype/freetype.pri)
167
 
    LIBS += -lfreetype
 
194
    LIBS_PRIVATE += -lfreetype
168
195
} else {
169
196
    DEFINES *= QT_NO_FREETYPE
170
197
}