From f2486adc1b2c97a1a98e78b3e283d75b1ac3ef65 Mon Sep 17 00:00:00 2001 From: Konstantin Ritt Date: Mon, 23 Mar 2015 02:11:50 +0400 Subject: Build bundled freetype as qt_helper_lib And thus do not disable warnings for the whole module when configured with -qt-freetype. Change-Id: I601a7c2990c8e3377531a28078db73800c138ec1 Reviewed-by: Oswald Buddenhagen --- src/platformsupport/fontdatabases/basic/basic.pri | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'src/platformsupport') diff --git a/src/platformsupport/fontdatabases/basic/basic.pri b/src/platformsupport/fontdatabases/basic/basic.pri index c09ea4eed5..d70b3b6a1a 100644 --- a/src/platformsupport/fontdatabases/basic/basic.pri +++ b/src/platformsupport/fontdatabases/basic/basic.pri @@ -10,9 +10,4 @@ SOURCES += \ CONFIG += opentype -contains(QT_CONFIG, freetype) { - include($$QT_SOURCE_TREE/src/3rdparty/freetype.pri) -} else:contains(QT_CONFIG, system-freetype) { - # pull in the proper freetype2 include directory - include($$QT_SOURCE_TREE/config.tests/unix/freetype/freetype.pri) -} +include($$QT_SOURCE_TREE/src/3rdparty/freetype_dependency.pri) -- cgit v1.2.3