diff options
Diffstat (limited to 'src/src.pro')
| -rw-r--r-- | src/src.pro | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/src.pro b/src/src.pro index 3d185408f8..c4da871abe 100644 --- a/src/src.pro +++ b/src/src.pro @@ -132,9 +132,9 @@ src_plugins.depends = src_sql src_xml src_network src_android.subdir = $$PWD/android # this order is important -contains(QT_CONFIG, zlib)|cross_compile { +!contains(QT_CONFIG, system-zlib)|cross_compile { SUBDIRS += src_qtzlib - contains(QT_CONFIG, zlib) { + !contains(QT_CONFIG, system-zlib) { src_3rdparty_libpng.depends += src_corelib src_3rdparty_freetype.depends += src_corelib } @@ -159,11 +159,11 @@ 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 } - win32:contains(QT_CONFIG, angle)|contains(QT_CONFIG, dynamicgl) { + contains(QT_CONFIG, angle) { SUBDIRS += src_angle src_gui.depends += src_angle } @@ -172,7 +172,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent src_3rdparty_freetype.depends += src_3rdparty_libpng src_gui.depends += src_3rdparty_libpng } - contains(QT_CONFIG, freetype) { + contains(QT_CONFIG, freetype):!contains(QT_CONFIG, system-freetype) { SUBDIRS += src_3rdparty_freetype src_platformsupport.depends += src_3rdparty_freetype } |