diff options
author | Justin McPherson <justin.mcpherson@nokia.com> | 2009-12-14 11:09:50 +1000 |
---|---|---|
committer | Justin McPherson <justin.mcpherson@nokia.com> | 2009-12-14 11:09:50 +1000 |
commit | cce709287279a8dd5ac17ed4c9dd09ebb78c4f27 (patch) | |
tree | 4d8f23ce11ddd57ffc356d79f9988d7c3f406922 /config.tests | |
parent | 11f61a9c413352e01fd2180250aa3fb09e1b4ac9 (diff) | |
parent | ad2509f8d7c634364ae7082dcc83b6906d235750 (diff) | |
download | qt4-tools-cce709287279a8dd5ac17ed4c9dd09ebb78c4f27.tar.gz |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6
Conflicts:
configure.exe
Diffstat (limited to 'config.tests')
-rw-r--r-- | config.tests/unix/alsa/alsatest.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/config.tests/unix/alsa/alsatest.cpp b/config.tests/unix/alsa/alsatest.cpp index 1307c4e530..f1092f8513 100644 --- a/config.tests/unix/alsa/alsatest.cpp +++ b/config.tests/unix/alsa/alsatest.cpp @@ -40,8 +40,11 @@ ****************************************************************************/ #include <alsa/asoundlib.h> +#if(!(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 10)) +#error "Alsa version found too old, require >= 1.0.10" +#endif + int main(int argc,char **argv) { - return 0; } |