6d0df2
diff -up qt-everywhere-opensource-src-4.8.7/config.tests/unix/alsa/alsatest.cpp.than qt-everywhere-opensource-src-4.8.7/config.tests/unix/alsa/alsatest.cpp
6d0df2
--- qt-everywhere-opensource-src-4.8.7/config.tests/unix/alsa/alsatest.cpp.than	2016-02-10 16:31:02.450152334 +0100
6d0df2
+++ qt-everywhere-opensource-src-4.8.7/config.tests/unix/alsa/alsatest.cpp	2016-02-10 16:31:51.495307579 +0100
6d0df2
@@ -40,7 +40,7 @@
6d0df2
 ****************************************************************************/
6d0df2
 
6d0df2
 #include <alsa/asoundlib.h>
6d0df2
-#if(!(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 10))
6d0df2
+#if(!(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 10)))
6d0df2
 #error "Alsa version found too old, require >= 1.0.10"
6d0df2
 #endif
6d0df2
 
Kevin Kofler 444964
diff --git a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp
Kevin Kofler 444964
index 973cbab..0b27e9d 100644
Kevin Kofler 444964
--- a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp
Kevin Kofler 444964
+++ b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp
Kevin Kofler 444964
@@ -63,7 +63,7 @@ QAudioDeviceInfoInternal::QAudioDeviceInfoInternal(QByteArray dev, QAudio::Mode
Kevin Kofler 444964
     device = QLatin1String(dev);
Kevin Kofler 444964
     this->mode = mode;
Kevin Kofler 444964
 
Kevin Kofler 444964
-#if (SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
Kevin Kofler 444964
+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
Kevin Kofler 444964
     checkSurround();
Kevin Kofler 444964
 #endif
Kevin Kofler 444964
 }
Kevin Kofler 444964
@@ -159,13 +159,13 @@ bool QAudioDeviceInfoInternal::open()
Kevin Kofler 444964
     QList<QByteArray> devices = availableDevices(mode);
Kevin Kofler 444964
 
Kevin Kofler 444964
     if(dev.compare(QLatin1String("default")) == 0) {
Kevin Kofler 444964
-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
Kevin Kofler 444964
+#if(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
Kevin Kofler 444964
         dev = QLatin1String(devices.first().constData());
Kevin Kofler 444964
 #else
Kevin Kofler 444964
         dev = QLatin1String("hw:0,0");
Kevin Kofler 444964
 #endif
Kevin Kofler 444964
     } else {
Kevin Kofler 444964
-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
Kevin Kofler 444964
+#if(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
Kevin Kofler 444964
         dev = device;
Kevin Kofler 444964
 #else
Kevin Kofler 444964
         int idx = 0;
Kevin Kofler 444964
@@ -212,13 +212,13 @@ bool QAudioDeviceInfoInternal::testSettings(const QAudioFormat& format) const
Kevin Kofler 444964
     QList<QByteArray> devices = QAudioDeviceInfoInternal::availableDevices(QAudio::AudioOutput);
Kevin Kofler 444964
 
Kevin Kofler 444964
     if(dev.compare(QLatin1String("default")) == 0) {
Kevin Kofler 444964
-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
Kevin Kofler 444964
+#if(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
Kevin Kofler 444964
         dev = QLatin1String(devices.first().constData());
Kevin Kofler 444964
 #else
Kevin Kofler 444964
         dev = QLatin1String("hw:0,0");
Kevin Kofler 444964
 #endif
Kevin Kofler 444964
     } else {
Kevin Kofler 444964
-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
Kevin Kofler 444964
+#if(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
Kevin Kofler 444964
         dev = device;
Kevin Kofler 444964
 #else
Kevin Kofler 444964
         int idx = 0;
Kevin Kofler 444964
@@ -396,7 +396,7 @@ void QAudioDeviceInfoInternal::updateLists()
Kevin Kofler 444964
     }
Kevin Kofler 444964
     channelz.append(1);
Kevin Kofler 444964
     channelz.append(2);
Kevin Kofler 444964
-#if (SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
Kevin Kofler 444964
+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
Kevin Kofler 444964
     if (surround40) channelz.append(4);
Kevin Kofler 444964
     if (surround51) channelz.append(6);
Kevin Kofler 444964
     if (surround71) channelz.append(8);
Kevin Kofler 444964
@@ -419,7 +419,7 @@ QList<QByteArray> QAudioDeviceInfoInternal::availableDevices(QAudio::Mode mode)
Kevin Kofler 444964
     QList<QByteArray> devices;
Kevin Kofler 444964
     QByteArray filter;
Kevin Kofler 444964
 
Kevin Kofler 444964
-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
Kevin Kofler 444964
+#if(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
Kevin Kofler 444964
     // Create a list of all current audio devices that support mode
Kevin Kofler 444964
     void **hints, **n;
Kevin Kofler 444964
     char *name, *descr, *io;
Kevin Kofler 444964
@@ -498,7 +498,7 @@ QByteArray QAudioDeviceInfoInternal::defaultOutputDevice()
Kevin Kofler 444964
     return devices.first();
Kevin Kofler 444964
 }
Kevin Kofler 444964
 
Kevin Kofler 444964
-#if (SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
Kevin Kofler 444964
+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
Kevin Kofler 444964
 void QAudioDeviceInfoInternal::checkSurround()
Kevin Kofler 444964
 {
Kevin Kofler 444964
     QList<QByteArray> devices;
Kevin Kofler 444964
diff --git a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h
Kevin Kofler 444964
index 96febf4..714bf60 100644
Kevin Kofler 444964
--- a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h
Kevin Kofler 444964
+++ b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h
Kevin Kofler 444964
@@ -98,7 +98,7 @@ private:
Kevin Kofler 444964
     bool open();
Kevin Kofler 444964
     void close();
Kevin Kofler 444964
 
Kevin Kofler 444964
-#if (SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
Kevin Kofler 444964
+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
Kevin Kofler 444964
     void checkSurround();
Kevin Kofler 444964
     bool surround40;
Kevin Kofler 444964
     bool surround51;
Kevin Kofler 444964
diff --git a/src/multimedia/audio/qaudioinput_alsa_p.cpp b/src/multimedia/audio/qaudioinput_alsa_p.cpp
Kevin Kofler 444964
index 339fd9f..abfa4a1 100644
Kevin Kofler 444964
--- a/src/multimedia/audio/qaudioinput_alsa_p.cpp
Kevin Kofler 444964
+++ b/src/multimedia/audio/qaudioinput_alsa_p.cpp
Kevin Kofler 444964
@@ -284,13 +284,13 @@ bool QAudioInputPrivate::open()
Kevin Kofler 444964
     QString dev = QString(QLatin1String(m_device.constData()));
Kevin Kofler 444964
     QList<QByteArray> devices = QAudioDeviceInfoInternal::availableDevices(QAudio::AudioInput);
Kevin Kofler 444964
     if(dev.compare(QLatin1String("default")) == 0) {
Kevin Kofler 444964
-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
Kevin Kofler 444964
+#if(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
Kevin Kofler 444964
         dev = QLatin1String(devices.first());
Kevin Kofler 444964
 #else
Kevin Kofler 444964
         dev = QLatin1String("hw:0,0");
Kevin Kofler 444964
 #endif
Kevin Kofler 444964
     } else {
Kevin Kofler 444964
-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
Kevin Kofler 444964
+#if(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
Kevin Kofler 444964
         dev = QLatin1String(m_device);
Kevin Kofler 444964
 #else
Kevin Kofler 444964
         int idx = 0;
Kevin Kofler 444964
diff --git a/src/multimedia/audio/qaudiooutput_alsa_p.cpp b/src/multimedia/audio/qaudiooutput_alsa_p.cpp
Kevin Kofler 444964
index bf85de5..c29a89f 100644
Kevin Kofler 444964
--- a/src/multimedia/audio/qaudiooutput_alsa_p.cpp
Kevin Kofler 444964
+++ b/src/multimedia/audio/qaudiooutput_alsa_p.cpp
Kevin Kofler 444964
@@ -299,13 +299,13 @@ bool QAudioOutputPrivate::open()
Kevin Kofler 444964
     QString dev = QString(QLatin1String(m_device.constData()));
Kevin Kofler 444964
     QList<QByteArray> devices = QAudioDeviceInfoInternal::availableDevices(QAudio::AudioOutput);
Kevin Kofler 444964
     if(dev.compare(QLatin1String("default")) == 0) {
Kevin Kofler 444964
-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
Kevin Kofler 444964
+#if(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
Kevin Kofler 444964
         dev = QLatin1String(devices.first());
Kevin Kofler 444964
 #else
Kevin Kofler 444964
         dev = QLatin1String("hw:0,0");
Kevin Kofler 444964
 #endif
Kevin Kofler 444964
     } else {
Kevin Kofler 444964
-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
Kevin Kofler 444964
+#if(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
Kevin Kofler 444964
         dev = QLatin1String(m_device);
Kevin Kofler 444964
 #else
Kevin Kofler 444964
         int idx = 0;