diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2014-02-25 15:33:43 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-14 18:18:26 +0100 |
| commit | a7e58bf253d08b896df3bbf247bbbaae718e426d (patch) | |
| tree | f54af4053622902ea9e0dfae2bac778799b82d18 /src/src.pro | |
| parent | 4dcf40b30894c0535f8a06235d01928cd434819d (diff) | |
Build bundled HarfBuzz-NG outside QtGui
Being a part of QtGui, HarfBuzz-NG breaks build with -Werror.
Instead of disabling a particular warnings-as-errors,
build a prefixed static library and make it a link-time dependency.
Change-Id: Id0be1f0e0034092d50f83cd364d5c65940fee869
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/src.pro')
| -rw-r--r-- | src/src.pro | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/src.pro b/src/src.pro index 114ee5e424..687f2502ab 100644 --- a/src/src.pro +++ b/src/src.pro @@ -80,6 +80,9 @@ src_testlib.subdir = $$PWD/testlib src_testlib.target = sub-testlib src_testlib.depends = src_corelib # src_gui & src_widgets are not build-depends +src_3rdparty_harfbuzzng.subdir = $$PWD/3rdparty/harfbuzz-ng +src_3rdparty_harfbuzzng.target = sub-3rdparty-harfbuzzng + src_angle.subdir = $$PWD/angle src_angle.target = sub-angle angle_d3d11: src_angle.depends = src_corelib @@ -130,6 +133,10 @@ contains(QT_CONFIG, dbus) { } contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent !contains(QT_CONFIG, no-gui) { + contains(QT_CONFIG, harfbuzz) { + SUBDIRS += src_3rdparty_harfbuzzng + src_gui.depends += src_3rdparty_harfbuzzng + } win32:contains(QT_CONFIG, angle)|contains(QT_CONFIG, dynamicgl) { SUBDIRS += src_angle src_gui.depends += src_angle @@ -159,7 +166,8 @@ 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_tools_bootstrap_dbus src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml \ + src_3rdparty_harfbuzzng sub-tools.depends = $$TOOLS QMAKE_EXTRA_TARGETS = sub-tools |