From 468656296b79ab2c87fd9ddf10b9f3bdf8ce67c0 Mon Sep 17 00:00:00 2001
From: Lev Zelenskiy <lev.zelenskiy@nokia.com>
Date: Fri, 29 Jun 2012 16:17:34 +1000
Subject: Use utf8 to store audio device names in win32 backend.

QTBUG-21398

Change-Id: I9a319d4365b1fa26b6b4f63baf7c97e26df4f482
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
---
 src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp b/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
index c60aac6..784d598 100644
--- a/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
+++ b/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
@@ -76,7 +76,7 @@ QT_BEGIN_NAMESPACE
 
 QAudioDeviceInfoInternal::QAudioDeviceInfoInternal(QByteArray dev, QAudio::Mode mode)
 {
-    device = QLatin1String(dev);
+    device = QString::fromUtf8(dev);
     this->mode = mode;
 
     updateLists();
@@ -413,7 +413,7 @@ QList<QByteArray> QAudioDeviceInfoInternal::availableDevices(QAudio::Mode mode)
 	for(i=0;i<iNumDevs;i++) {
 	    if(waveOutGetDevCaps(i, &woc, sizeof(WAVEOUTCAPS))
 	        == MMSYSERR_NOERROR) {
-	        devices.append(QString((const QChar *)woc.szPname).toLocal8Bit().constData());
+            devices.append(QString((const QChar *)woc.szPname).toUtf8().constData());
 	    }
 	}
     } else {
@@ -423,7 +423,7 @@ QList<QByteArray> QAudioDeviceInfoInternal::availableDevices(QAudio::Mode mode)
 	for(i=0;i<iNumDevs;i++) {
 	    if(waveInGetDevCaps(i, &woc, sizeof(WAVEINCAPS))
 	        == MMSYSERR_NOERROR) {
-	        devices.append(QString((const QChar *)woc.szPname).toLocal8Bit().constData());
+            devices.append(QString((const QChar *)woc.szPname).toUtf8().constData());
 	    }
 	}
 
-- 
cgit v0.12