diff options
Diffstat (limited to 'src/src.pro')
| -rw-r--r-- | src/src.pro | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/src.pro b/src/src.pro index 4a165a2dab..0e411f96af 100644 --- a/src/src.pro +++ b/src/src.pro @@ -129,7 +129,7 @@ src_plugins.depends = src_sql src_xml src_network src_android.subdir = $$PWD/android # this order is important -contains(QT_CONFIG, zlib)|cross_compile: SUBDIRS += src_qtzlib +!contains(QT_CONFIG, system-zlib)|cross_compile: SUBDIRS += src_qtzlib SUBDIRS += src_tools_bootstrap src_tools_moc src_tools_rcc !contains(QT_DISABLED_FEATURES, regularexpression):pcre { SUBDIRS += src_3rdparty_pcre @@ -149,7 +149,7 @@ contains(QT_CONFIG, dbus) { } contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent !contains(QT_CONFIG, no-gui) { - contains(QT_CONFIG, harfbuzz) { + contains(QT_CONFIG, harfbuzz):!contains(QT_CONFIG, system-harfbuzz) { SUBDIRS += src_3rdparty_harfbuzzng src_gui.depends += src_3rdparty_harfbuzzng } @@ -157,7 +157,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent SUBDIRS += src_angle src_gui.depends += src_angle } - contains(QT_CONFIG, freetype) { + contains(QT_CONFIG, freetype):!contains(QT_CONFIG, system-freetype) { SUBDIRS += src_3rdparty_freetype src_platformsupport.depends += src_3rdparty_freetype } |