diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-04-12 10:19:19 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-04-12 10:20:01 (GMT) |
| commit | f5bde58801fb2f38404a1ecfd5b006d5d627ee96 (patch) | |
| tree | 575712f4cef148214428816b18212a234a0f811e /src/3rdparty | |
| parent | aab30e9a3ec78c3a9b2998feeef275e973ef0ff2 (diff) | |
| download | Qt-f5bde58801fb2f38404a1ecfd5b006d5d627ee96.zip Qt-f5bde58801fb2f38404a1ecfd5b006d5d627ee96.tar.gz Qt-f5bde58801fb2f38404a1ecfd5b006d5d627ee96.tar.bz2 | |
Build fix
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/phonon/ds9/mediaobject.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/3rdparty/phonon/ds9/mediaobject.cpp b/src/3rdparty/phonon/ds9/mediaobject.cpp index b8ef93b..d640956 100644 --- a/src/3rdparty/phonon/ds9/mediaobject.cpp +++ b/src/3rdparty/phonon/ds9/mediaobject.cpp @@ -820,21 +820,11 @@ namespace Phonon #endif LPAMGETERRORTEXT getErrorText = (LPAMGETERRORTEXT)QLibrary::resolve(QLatin1String("quartz"), "AMGetErrorTextW"); -<<<<<<< HEAD:src/3rdparty/phonon/ds9/mediaobject.cpp WCHAR buffer[MAX_ERROR_TEXT_LEN]; if (getErrorText && getErrorText(hr, buffer, MAX_ERROR_TEXT_LEN)) { m_errorString = QString::fromWCharArray(buffer); } else { m_errorString = QString::fromLatin1("Unknown error"); -======= - ushort buffer[MAX_ERROR_TEXT_LEN]; - if (getErrorText && getErrorText(hr, (WCHAR*)buffer, MAX_ERROR_TEXT_LEN)) { - m_errorString = QString::fromUtf16(buffer); -#ifdef Q_CC_MSVC - } else { - m_errorString = QString::fromUtf16((ushort*)_com_error(hr).ErrorMessage()); -#endif ->>>>>>> internal-qt-repo/4.7:src/3rdparty/phonon/ds9/mediaobject.cpp } const QString comError = QString::number(uint(hr), 16); if (!m_errorString.toLower().contains(comError.toLower())) { |