summaryrefslogtreecommitdiffstats
path: root/src/platformsupport/fontdatabases/basic
diff options
context:
space:
mode:
authorKonstantin Ritt <ritt.ks@gmail.com>2015-03-23 02:11:50 +0400
committerKonstantin Ritt <ritt.ks@gmail.com>2015-03-27 21:54:22 +0000
commitf2486adc1b2c97a1a98e78b3e283d75b1ac3ef65 (patch)
treeff43b55beac8993d010f16ee980f918d3e077332 /src/platformsupport/fontdatabases/basic
parentebafb2f14bb2855176de17a1131c1e7db01f2e0c (diff)
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 <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'src/platformsupport/fontdatabases/basic')
-rw-r--r--src/platformsupport/fontdatabases/basic/basic.pri7
1 files changed, 1 insertions, 6 deletions
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)