diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2015-03-23 02:11:50 +0400 |
|---|---|---|
| committer | Konstantin Ritt <ritt.ks@gmail.com> | 2015-03-27 21:54:22 +0000 |
| commit | f2486adc1b2c97a1a98e78b3e283d75b1ac3ef65 (patch) | |
| tree | ff43b55beac8993d010f16ee980f918d3e077332 /src/src.pro | |
| parent | ebafb2f14bb2855176de17a1131c1e7db01f2e0c (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/src.pro')
| -rw-r--r-- | src/src.pro | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/src.pro b/src/src.pro index 3dd9f8c9ce..fcdc6c32e0 100644 --- a/src/src.pro +++ b/src/src.pro @@ -90,6 +90,9 @@ src_3rdparty_harfbuzzng.subdir = $$PWD/3rdparty/harfbuzz-ng src_3rdparty_harfbuzzng.target = sub-3rdparty-harfbuzzng src_3rdparty_harfbuzzng.depends = src_corelib # for the Qt atomics +src_3rdparty_freetype.subdir = $$PWD/3rdparty/freetype +src_3rdparty_freetype.target = sub-3rdparty-freetype + src_angle.subdir = $$PWD/angle src_angle.target = sub-angle @@ -156,6 +159,10 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent SUBDIRS += src_angle src_gui.depends += src_angle } + contains(QT_CONFIG, freetype) { + SUBDIRS += src_3rdparty_freetype + src_platformsupport.depends += src_3rdparty_freetype + } SUBDIRS += src_gui src_platformsupport src_platformheaders contains(QT_CONFIG, opengl(es2)?):SUBDIRS += src_openglextensions src_plugins.depends += src_gui src_platformsupport src_platformheaders @@ -182,7 +189,7 @@ android:!android-no-sdk: SUBDIRS += src_android TR_EXCLUDE = \ src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_uic src_tools_qlalr \ src_tools_bootstrap_dbus src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml \ - src_3rdparty_pcre src_3rdparty_harfbuzzng + src_3rdparty_pcre src_3rdparty_harfbuzzng src_3rdparty_freetype sub-tools.depends = $$TOOLS QMAKE_EXTRA_TARGETS = sub-tools |