diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-06 20:21:19 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-06 20:21:19 +0100 |
| commit | 82621148de82d63a562163a72598e15ed98797a8 (patch) | |
| tree | 030d345ad4a4ae612995949bbbeec66b36e69854 /src/plugins/wasapi | |
| parent | 2fc515ea1eaa0f7ffb56c4dadee560095c3374bd (diff) | |
| parent | 7a3b8907060123fe5d487d4c9ba3a1e222f468bb (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
.qmake.conf
Change-Id: I5acdc7e0bd3729b80522dfff0f388cf2507fb111
Diffstat (limited to 'src/plugins/wasapi')
| -rw-r--r-- | src/plugins/wasapi/qwasapiaudiodeviceinfo.cpp | 2 |
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); |