summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-09-08 12:35:39 +0200
committerLiang Qi <liang.qi@qt.io>2017-09-08 12:35:39 +0200
commit230f070c7ed353605260f9fa79d0a5bc5181321c (patch)
tree50d6c110ccf3ee74b25e9be2408e95c29e49338d
parente8fd67aacf00537eae76723ccbe15e2d3f861f9d (diff)
parent500552d11bc5ca2e762875019a15b02d451de1f6 (diff)
Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-alpha1
-rw-r--r--dist/changes-5.6.366
-rw-r--r--src/plugins/alsa/qalsaaudioinput.cpp2
-rw-r--r--tests/auto/integration/qaudiooutput/BLACKLIST2
3 files changed, 69 insertions, 1 deletions
diff --git a/dist/changes-5.6.3 b/dist/changes-5.6.3
new file mode 100644
index 00000000..32a581da
--- /dev/null
+++ b/dist/changes-5.6.3
@@ -0,0 +1,66 @@
+Qt 5.6.3 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.6.0.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+ http://doc.qt.io/qt-5/index.html
+
+The Qt version 5.6 series is binary compatible with the 5.5.x series.
+Applications compiled for 5.5 will continue to run with 5.6.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+ https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+* Library *
+****************************************************************************
+
+QtMultimedia
+------------
+
+- [QTBUG-55007] Fixed Playlist's documentation to include signals that were
+ wrongly listed under the Audio element.
+
+- [QTBUG-54849] Optimized QMediaPlaylistPrivate::readItems() to pass items
+ to the backend in bulk instead of doing it one item at a time.
+
+****************************************************************************
+* Platform Specific Changes *
+****************************************************************************
+
+Windows
+-------
+
+- Enabled DirectShow plugin on WinCE.
+
+- Made it possible to build the audio decode service from the WMF as a
+ standalone service, making it possible to use the audio decode service even
+ when DirectShow is used as the media player backend.
+
+- [QTBUG-43765] Fixed setting volume per stream when using multiple
+ QAudioOutputs.
+
+- [QTBUG-55359] Added support for MJPEG cameras in DirectShow.
+
+Android
+-------
+
+- [QTBUG-49578] Fixed mediaStatus signal reporting to work as documented.
+
+Linux
+-----
+
+- [QTBUG-49578] Fixed mediaStatus signal reporting to work as documented.
+
+- [QTBUG-50775] Improved handling of missing camerabin plugin.
+
+QNX
+---
+
+ - [QTBUG-50775] Fixed static linking.
diff --git a/src/plugins/alsa/qalsaaudioinput.cpp b/src/plugins/alsa/qalsaaudioinput.cpp
index 5a4111a9..0158e384 100644
--- a/src/plugins/alsa/qalsaaudioinput.cpp
+++ b/src/plugins/alsa/qalsaaudioinput.cpp
@@ -312,7 +312,7 @@ bool QAlsaAudioInput::open()
}
- if (!QAlsaAudioDeviceInfo::availableDevices(QAudio::AudioOutput).contains(m_device))
+ if (!QAlsaAudioDeviceInfo::availableDevices(QAudio::AudioInput).contains(m_device))
return false;
QString dev;
diff --git a/tests/auto/integration/qaudiooutput/BLACKLIST b/tests/auto/integration/qaudiooutput/BLACKLIST
new file mode 100644
index 00000000..c83b3041
--- /dev/null
+++ b/tests/auto/integration/qaudiooutput/BLACKLIST
@@ -0,0 +1,2 @@
+[pullSuspendResume]
+opensuse-42.3