diff options
| author | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-07-01 11:59:17 (GMT) |
|---|---|---|
| committer | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-07-01 12:00:03 (GMT) |
| commit | 5f9758295715c088c23f51d294b2b1b0fb361872 (patch) | |
| tree | 65d8c9fbf8804bcc681c513616ccf16174b442d7 /src/3rdparty | |
| parent | 574fdf0b7e61c1c9994739035d9adb51af2629d0 (diff) | |
| parent | d43a10d6d9a5f13fc8deac052926720927e09e83 (diff) | |
| download | Qt-5f9758295715c088c23f51d294b2b1b0fb361872.zip Qt-5f9758295715c088c23f51d294b2b1b0fb361872.tar.gz Qt-5f9758295715c088c23f51d294b2b1b0fb361872.tar.bz2 | |
Merge commit 'qt/master' into graphicssceneindex
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/phonon/ds9/qaudiocdreader.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/3rdparty/phonon/ds9/qaudiocdreader.cpp b/src/3rdparty/phonon/ds9/qaudiocdreader.cpp index b9f9fd6..d5bdce2 100644 --- a/src/3rdparty/phonon/ds9/qaudiocdreader.cpp +++ b/src/3rdparty/phonon/ds9/qaudiocdreader.cpp @@ -154,10 +154,7 @@ namespace Phonon path = QString::fromLatin1("\\\\.\\%1:").arg(drive); } - m_cddrive = QT_WA_INLINE ( - ::CreateFile( (TCHAR*)path.utf16(), GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL ), - ::CreateFileA( path.toLocal8Bit().constData(), GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL ) - ); + m_cddrive = ::CreateFile((const wchar_t *)path.utf16(), GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); qMemSet(m_toc, 0, sizeof(CDROM_TOC)); //read the TOC |