diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-22 07:24:57 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-22 07:28:42 +0100 |
| commit | a02863234d76abb6c9f289026ae4ea3145924f30 (patch) | |
| tree | aef6381d0000a78ba69ac80eb03739b1c8ca5fc3 /config.tests/unix | |
| parent | e77b13621f0057374d83a2b884f03dd2e5b7b88c (diff) | |
| parent | e4d79e1fdeb6b26ba0b12b578daacf7cd672b960 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
configure
mkspecs/common/wince/qplatformdefs.h
src/plugins/platforms/directfb/qdirectfbbackingstore.cpp
src/plugins/platforms/xcb/qxcbbackingstore.cpp
Change-Id: Ied4d31264a9afca9514b51a7eb1494c28712793c
Diffstat (limited to 'config.tests/unix')
| -rw-r--r-- | config.tests/unix/alsa/alsatest.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config.tests/unix/alsa/alsatest.cpp b/config.tests/unix/alsa/alsatest.cpp index f93eda4a37..1b2b141b79 100644 --- a/config.tests/unix/alsa/alsatest.cpp +++ b/config.tests/unix/alsa/alsatest.cpp @@ -38,7 +38,7 @@ ****************************************************************************/ #include <alsa/asoundlib.h> -#if(!(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 10)) +#if SND_LIB_VERSION < 0x1000a // 1.0.10 #error "Alsa version found too old, require >= 1.0.10" #endif |