diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-08-30 12:46:45 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-08-30 12:47:20 +0200 |
| commit | da6f33c8929bf122e7cdec5617d89c59d03e3632 (patch) | |
| tree | 9d90d90a3e7cdd6fbca8d40b54a45e90877677e4 /src/core/config | |
| parent | 9cda8d4384825bd93b949f31953548beda165ef8 (diff) | |
| parent | 327c9b9e0c68550e474d9ffdc21ece6324b5e7a1 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Change-Id: I82f7a6a6d1bf27dc8adf7e2a91ea8ab29c54a607
Diffstat (limited to 'src/core/config')
| -rw-r--r-- | src/core/config/linux.pri | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index 5e04701a0..a51a703bb 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -39,8 +39,17 @@ qtConfig(system-zlib): use?(system_minizip): GYP_CONFIG += use_system_zlib=1 qtConfig(system-png): GYP_CONFIG += use_system_libpng=1 qtConfig(system-jpeg): GYP_CONFIG += use_system_libjpeg=1 qtConfig(system-harfbuzz): GYP_CONFIG += use_system_harfbuzz=1 -!contains(QT_CONFIG, pulseaudio): GYP_CONFIG += use_pulseaudio=0 !qtConfig(glib): GYP_CONFIG += use_glib=0 +contains(QT_CONFIG, pulseaudio) { + GYP_CONFIG += use_pulseaudio=1 +} else { + GYP_CONFIG += use_pulseaudio=0 +} +contains(QT_CONFIG, alsa) { + GYP_CONFIG += use_alsa=1 +} else { + GYP_CONFIG += use_alsa=0 +} use?(system_libevent): GYP_CONFIG += use_system_libevent=1 use?(system_libwebp): GYP_CONFIG += use_system_libwebp=1 use?(system_libsrtp): GYP_CONFIG += use_system_libsrtp=1 |