diff options
author | Tom Cooksey <thomas.cooksey@nokia.com> | 2010-04-12 06:39:45 (GMT) |
---|---|---|
committer | Tom Cooksey <thomas.cooksey@nokia.com> | 2010-04-12 06:39:45 (GMT) |
commit | 757b9bf63dedbc33205f482c80f6843b738aa389 (patch) | |
tree | c352479613d29878e57de82b4141c17af662d044 /src/3rdparty/phonon | |
parent | f710d57af1cc03af143573135390e6c68eecbfe8 (diff) | |
parent | 27f8facfea87d7c4669852e7aa0fe5d9ca828eb3 (diff) | |
download | Qt-757b9bf63dedbc33205f482c80f6843b738aa389.zip Qt-757b9bf63dedbc33205f482c80f6843b738aa389.tar.gz Qt-757b9bf63dedbc33205f482c80f6843b738aa389.tar.bz2 |
Merge commit 'internal-qt-repo/4.7' into oslo-staging-2/4.7
Conflicts:
src/3rdparty/phonon/ds9/mediaobject.cpp
Diffstat (limited to 'src/3rdparty/phonon')
-rw-r--r-- | src/3rdparty/phonon/ds9/mediaobject.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/3rdparty/phonon/ds9/mediaobject.cpp b/src/3rdparty/phonon/ds9/mediaobject.cpp index 34f92c2..b8ef93b 100644 --- a/src/3rdparty/phonon/ds9/mediaobject.cpp +++ b/src/3rdparty/phonon/ds9/mediaobject.cpp @@ -27,6 +27,9 @@ along with this library. If not, see <http://www.gnu.org/licenses/>. #include <objbase.h> #include <initguid.h> #include <qnetwork.h> +#ifdef Q_CC_MSVC +# include <comdef.h> +#endif #include <evcode.h> #include "mediaobject.h" @@ -817,11 +820,21 @@ 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())) { |