summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dist/changes-5.10.041
-rw-r--r--src/multimedia/doc/qtmultimedia.qdocconf3
-rw-r--r--src/plugins/wasapi/qwasapiaudiodeviceinfo.cpp2
3 files changed, 45 insertions, 1 deletions
diff --git a/dist/changes-5.10.0 b/dist/changes-5.10.0
new file mode 100644
index 000000000..cbdb75b09
--- /dev/null
+++ b/dist/changes-5.10.0
@@ -0,0 +1,41 @@
+Qt 5.10 introduces many new features and improvements as well as bugfixes
+over the 5.9.x series. 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.10 series is binary compatible with the 5.9.x series.
+Applications compiled for 5.9 will continue to run with 5.10.
+
+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.
+
+****************************************************************************
+* Qt 5.10.0 Changes *
+****************************************************************************
+
+ - [QTBUG-57045] Fixed crash when calling pause in the onPositionChanged
+ handler.
+
+****************************************************************************
+* Platform Specific Changes *
+****************************************************************************
+
+QNX
+---
+ - Added support for setting audio roles.
+
+Linux
+-----
+ - [QTBUG-62621] Unsupported audio formats in PulseAudio will now be rejected
+ instead of being played incorrectly.
+ - [QTBUG-63427] QSoundEffect with PulseAudio now supports 24 bit samples.
+
+Windows
+-------
+ - Added support for QMediaMetaData::Orientation.
diff --git a/src/multimedia/doc/qtmultimedia.qdocconf b/src/multimedia/doc/qtmultimedia.qdocconf
index e3d3827c5..074fcb75e 100644
--- a/src/multimedia/doc/qtmultimedia.qdocconf
+++ b/src/multimedia/doc/qtmultimedia.qdocconf
@@ -43,6 +43,9 @@ qhp.QtMultimedia.subprojects.examples.sortPages = true
exampledirs += ../../../examples \
snippets
+manifestmeta.highlighted.names = "QtMultimedia/QML Video Shader Effects Example" \
+ "QtMultimedia/Media Player Example"
+
headerdirs += ../..
imagedirs += src/images \
diff --git a/src/plugins/wasapi/qwasapiaudiodeviceinfo.cpp b/src/plugins/wasapi/qwasapiaudiodeviceinfo.cpp
index e1a46841d..53345dec8 100644
--- a/src/plugins/wasapi/qwasapiaudiodeviceinfo.cpp
+++ b/src/plugins/wasapi/qwasapiaudiodeviceinfo.cpp
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
Q_LOGGING_CATEGORY(lcMmDeviceInfo, "qt.multimedia.deviceinfo")
QWasapiAudioDeviceInfo::QWasapiAudioDeviceInfo(QByteArray dev, QAudio::Mode mode)
- : m_deviceName(dev)
+ : m_deviceName(QString::fromLocal8Bit(dev))
{
qCDebug(lcMmDeviceInfo) << __FUNCTION__ << dev << mode;
m_interface = QWasapiUtils::createOrGetInterface(dev, mode);