slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/5.5' into 5.6

Browse Source 
Conflicts:
	src/plugins/android/src/wrappers/jni/androidcamera.cpp

Change-Id: Ibb34f710b1dfb9a23b378462f31432581c6c26f4
This commit is contained in:
Liang Qi
2016-01-07 11:13:47 +01:00
parent 0a7b553eea 604a5753fa
commit 6166f102f5
16 changed files with 243 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config.tests/alsa/alsatest.cpp
View File

@@ -32,7 +32,7 @@
****************************************************************************/
#include <alsa/asoundlib.h>
#if (!(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 10))
#if (!(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 10)))
#error "Alsa version found too old, require >= 1.0.10"
#endif