diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-10 10:36:33 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-10 10:36:38 +0100 |
| commit | 4eceed9ac0b646238e76d77569a619d4dc515ba5 (patch) | |
| tree | f4d770bf9bf16a528c94255c8d8396ba71bfd2d2 /src/core | |
| parent | ec029e0492b4b22ff703ef8d74c551f3f1af7926 (diff) | |
| parent | 72ff0b7d9600db642e2d2e95c78c70454bbdb5e7 (diff) | |
Merge remote-tracking branch 'origin/5.4.1' into 5.4
Change-Id: I484a058c08be04a87d2f84514193fb58e772246b
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/config/desktop_linux.pri | 1 | ||||
| -rw-r--r-- | src/core/config/embedded_linux.pri | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/core/config/desktop_linux.pri b/src/core/config/desktop_linux.pri index 7f28cb36b..57fb39f6e 100644 --- a/src/core/config/desktop_linux.pri +++ b/src/core/config/desktop_linux.pri @@ -14,3 +14,4 @@ GYP_CONFIG += \ use_kerberos=0 \ use_pango=0 \ +!contains(QT_CONFIG, pulseaudio): GYP_CONFIG += use_pulseaudio=0 diff --git a/src/core/config/embedded_linux.pri b/src/core/config/embedded_linux.pri index 4000625c6..773bf0be1 100644 --- a/src/core/config/embedded_linux.pri +++ b/src/core/config/embedded_linux.pri @@ -1,7 +1,7 @@ GYP_ARGS += "-D qt_os=\"embedded_linux\" -I config/embedded_linux.gypi" GYP_CONFIG += \ - build_ffmpegsumo=0 \ + build_ffmpegsumo=1 \ configuration_policy=0 \ desktop_linux=0 \ disable_nacl=1 \ |