diff options
| author | Christian Strømme <christian.stromme@theqtcompany.com> | 2016-01-15 17:27:32 +0100 |
|---|---|---|
| committer | Christian Strømme <christian.stromme@theqtcompany.com> | 2016-01-15 17:28:17 +0100 |
| commit | 84e426c3af2a3bb1b7f916e54263aea758db38d0 (patch) | |
| tree | 4fe09a8da5b15ba466e5771239d06f29a6c123da /config.tests/alsa/alsatest.cpp | |
| parent | 84aaa48fdfc1f35c9870518a3d4b6f08a1f99449 (diff) | |
| parent | 924dc7f48c7003b46079623738ae531f34aed903 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/plugins/android/src/mediacapture/qandroidcamerasession.cpp
src/plugins/wmf/mftvideo.cpp
Change-Id: I78868b416ea4baec89ca3e2dc9eb4712db16d5fc
Diffstat (limited to 'config.tests/alsa/alsatest.cpp')
| -rw-r--r-- | config.tests/alsa/alsatest.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config.tests/alsa/alsatest.cpp b/config.tests/alsa/alsatest.cpp index a9f9c2494..1b59cb17b 100644 --- a/config.tests/alsa/alsatest.cpp +++ b/config.tests/alsa/alsatest.cpp @@ -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 |