whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove bogus freetype dependency stuff 

fixes rebase FAIL in f9a80e06a.

the ft dependency itself is pulled in via the basic font database, which
is included if ft is used.

Change-Id: I4e9c0c44bd0360b702953e51cde4c5d526eff499
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
bb10
Oswald Buddenhagen 2016-11-01 11:21:20 +01:00
parent 0239b4f217
commit 147b7d9da2
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/platformsupport/fontdatabases/windows/windows.pri
View File

@ -13,11 +13,6 @@ HEADERS += \
qtConfig(freetype) {
SOURCES += $$PWD/qwindowsfontdatabase_ft.cpp
HEADERS += $$PWD/qwindowsfontdatabase_ft_p.h
qtConfig(system-freetype) {
include($$QT_SOURCE_TREE/src/platformsupport/fontdatabases/basic/basic.pri)
} else {
include($$QT_SOURCE_TREE/src/3rdparty/freetype_dependency.pri)
}
}
qtConfig(directwrite) {