diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-14 13:28:53 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-02-14 13:28:53 +0000 |
| commit | 72472b8b06b9aa54e7f6cf3171b6c95606b23a16 (patch) | |
| tree | 07f687a7c393884694485c4b26c5599ba4a2c7c7 /src/core/config | |
| parent | ad17dd16e8c0be602c8751cdc8ada0903f642ee0 (diff) | |
| parent | 3ec6544f65203743b0896fd1eca30931d3109cb3 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev
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 \ |