diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-13 13:11:08 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-13 13:11:08 +0100 |
| commit | 3ec6544f65203743b0896fd1eca30931d3109cb3 (patch) | |
| tree | ac2531881a76dfa523392494737d1428b4f1a942 /src/core/config | |
| parent | eee482929a81ae9d685a0ee140733227ceac6543 (diff) | |
| parent | 4eceed9ac0b646238e76d77569a619d4dc515ba5 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: Ic4388b2c28f46ca8047061c049128672041ceb0b
Diffstat (limited to 'src/core/config')
| -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 5a904fb83..500e04448 100644 --- a/src/core/config/desktop_linux.pri +++ b/src/core/config/desktop_linux.pri @@ -16,3 +16,4 @@ GYP_CONFIG += \ host_clang=0 \ clang=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 \ |