Merge remote-tracking branch 'origin/5.10.0' into 5.10

Change-Id: Iffeb04c00f5b9e7a51320570ea47e84d80fae844

3 files changed, 4 insertions, 2 deletions

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/android/src/common/qandroidvideooutput.cpp b/src/plugins/android/src/common/qandroidvideooutput.cpp
index eb41d4a8e..b425b9d89 100644
--- a/src/plugins/android/src/common/qandroidvideooutput.cpp
+++ b/src/plugins/android/src/common/qandroidvideooutput.cpp
@@ -324,7 +324,6 @@ void QAndroidTextureVideoOutput::onFrameAvailable()
     if (!m_surface->isActive()) {
         QVideoSurfaceFormat format(frame.size(), frame.pixelFormat(),
                                    QAbstractVideoBuffer::GLTextureHandle);
-        format.setScanLineDirection(QVideoSurfaceFormat::BottomToTop);
 
         m_surface->start(format);
     }
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);