diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-11-01 11:21:20 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-11-01 15:22:58 +0000 |
| commit | 147b7d9da2656c23d7ca7ed38e408a61ed605c6d (patch) | |
| tree | 56eac250c9eb2d7b7fc63c839cca02816621f066 | |
| parent | 0239b4f21705af3c47ebfda34fa354ecc865c52d (diff) | |
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>
| -rw-r--r-- | src/platformsupport/fontdatabases/windows/windows.pri | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/platformsupport/fontdatabases/windows/windows.pri b/src/platformsupport/fontdatabases/windows/windows.pri index 419c4dc6d9..4fc4e7b8ec 100644 --- a/src/platformsupport/fontdatabases/windows/windows.pri +++ b/src/platformsupport/fontdatabases/windows/windows.pri @@ -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) { |