equal
deleted
inserted
replaced
136 ../3rdparty/freetype/src/base/ftdebug.c \ |
136 ../3rdparty/freetype/src/base/ftdebug.c \ |
137 ../3rdparty/freetype/src/base/ftglyph.c \ |
137 ../3rdparty/freetype/src/base/ftglyph.c \ |
138 ../3rdparty/freetype/src/base/ftinit.c \ |
138 ../3rdparty/freetype/src/base/ftinit.c \ |
139 ../3rdparty/freetype/src/base/ftmm.c \ |
139 ../3rdparty/freetype/src/base/ftmm.c \ |
140 ../3rdparty/freetype/src/base/fttype1.c \ |
140 ../3rdparty/freetype/src/base/fttype1.c \ |
141 ../3rdparty/freetype/src/base/ftbitmap.c\ |
141 ../3rdparty/freetype/src/base/ftsynth.c \ |
|
142 ../3rdparty/freetype/src/base/ftbitmap.c \ |
142 ../3rdparty/freetype/src/bdf/bdf.c \ |
143 ../3rdparty/freetype/src/bdf/bdf.c \ |
143 ../3rdparty/freetype/src/cache/ftcache.c \ |
144 ../3rdparty/freetype/src/cache/ftcache.c \ |
144 ../3rdparty/freetype/src/cff/cff.c \ |
145 ../3rdparty/freetype/src/cff/cff.c \ |
145 ../3rdparty/freetype/src/cid/type1cid.c \ |
146 ../3rdparty/freetype/src/cid/type1cid.c \ |
146 ../3rdparty/freetype/src/gzip/ftgzip.c \ |
147 ../3rdparty/freetype/src/gzip/ftgzip.c \ |
194 } else:contains(QT_CONFIG, system-freetype) { |
195 } else:contains(QT_CONFIG, system-freetype) { |
195 embedded:CONFIG += opentype |
196 embedded:CONFIG += opentype |
196 # pull in the proper freetype2 include directory |
197 # pull in the proper freetype2 include directory |
197 include($$QT_SOURCE_TREE/config.tests/unix/freetype/freetype.pri) |
198 include($$QT_SOURCE_TREE/config.tests/unix/freetype/freetype.pri) |
198 LIBS_PRIVATE += -lfreetype |
199 LIBS_PRIVATE += -lfreetype |
199 } else { |
|
200 DEFINES *= QT_NO_FREETYPE |
|
201 } |
200 } |
202 |
201 |
203 contains(QT_CONFIG, fontconfig) { |
202 contains(QT_CONFIG, fontconfig) { |
204 CONFIG += opentype |
203 CONFIG += opentype |
205 } |
204 } |