diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-10 06:35:39 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-10 06:35:39 (GMT) |
| commit | ac27c8ad39a9646a9e509ba7a58f75eeae10bb6e (patch) | |
| tree | d057f4ce081b643aae0e8db07e5101a213e02551 /src/3rdparty | |
| parent | 7690bab57ef7ae6d669c6df23e9de72fd8a85d62 (diff) | |
| parent | f5ad30c5b425ea4ebaa25d0ffc3d1c3e1f96ae09 (diff) | |
| download | Qt-ac27c8ad39a9646a9e509ba7a58f75eeae10bb6e.zip Qt-ac27c8ad39a9646a9e509ba7a58f75eeae10bb6e.tar.gz Qt-ac27c8ad39a9646a9e509ba7a58f75eeae10bb6e.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Reimplemented event() and sceneEvent() in video item, for BC.
Fix Phonon build with mingw.
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/phonon/ds9/mediaobject.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/3rdparty/phonon/ds9/mediaobject.cpp b/src/3rdparty/phonon/ds9/mediaobject.cpp index d1e15c0..b9a8713 100644 --- a/src/3rdparty/phonon/ds9/mediaobject.cpp +++ b/src/3rdparty/phonon/ds9/mediaobject.cpp @@ -27,7 +27,9 @@ along with this library. If not, see <http://www.gnu.org/licenses/>. #include <objbase.h> #include <initguid.h> #include <qnetwork.h> -#include <comdef.h> +#ifdef Q_CC_MSVC +# include <comdef.h> +#endif #include <evcode.h> #include "mediaobject.h" @@ -851,8 +853,10 @@ namespace Phonon 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 } const QString comError = QString::number(uint(hr), 16); if (!m_errorString.toLower().contains(comError.toLower())) { |