diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-07 06:12:11 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-07 06:12:11 (GMT) |
| commit | 02312c82024103f99affe5ad65c377cda99e1ff3 (patch) | |
| tree | 2620c00c552d2666579e705acbd92fb6d012751e | |
| parent | 19a566f82a7c684423331a8caab70ec594afd1ce (diff) | |
| parent | f3e9ec546a811f31b4a0c934f0b1c6fa571fa020 (diff) | |
| download | Qt-02312c82024103f99affe5ad65c377cda99e1ff3.zip Qt-02312c82024103f99affe5ad65c377cda99e1ff3.tar.gz Qt-02312c82024103f99affe5ad65c377cda99e1ff3.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:
Fix Phonon build with mingw.
| -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())) { |