diff options
| author | Lev Zelenskiy <lev.zelenskiy@nokia.com> | 2012-06-29 16:17:34 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-03 08:05:42 +0200 |
| commit | 468656296b79ab2c87fd9ddf10b9f3bdf8ce67c0 (patch) | |
| tree | b48b9f9da23708d5a4ec74f3f731364c68246180 /src/multimedia | |
| parent | a333545518832c606110025ac6e06f6366807db2 (diff) | |
| download | qt4-tools-468656296b79ab2c87fd9ddf10b9f3bdf8ce67c0.tar.gz | |
Use utf8 to store audio device names in win32 backend.
QTBUG-21398
Change-Id: I9a319d4365b1fa26b6b4f63baf7c97e26df4f482
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp b/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp index c60aac68df..784d5980ac 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()); } } |