summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Ivash <elderorb@gmail.com>2017-11-13 22:57:05 +0300
committerThiago Macieira <thiago.macieira@intel.com>2017-11-14 16:21:21 +0000
commit01c1973c68e1ba0c505e1c07e0aa0652faccc0c5 (patch)
treed2e59f67fbf2439a8e0373704ff73f52c6fd75a7
parentde00842296bf0e9e5d377deb95598276041f55e0 (diff)
QWasapiAudioDeviceInfo: fix QByteArray => QString conversion
QByteArray was created inside 'QWasapiUtils::availableDevices' using 'toLocal8Bit' so needs to be converted to QString via 'fromLocal8Bit' Task-number: QTBUG-64262 Change-Id: I70cdaf35dbdbee671fbf7c4e1b46b18c13ca98cc Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
-rw-r--r--src/plugins/wasapi/qwasapiaudiodeviceinfo.cpp2
1 files changed, 1 insertions, 1 deletions
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);