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.

3 files changed, 29 insertions, 3 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())) {
diff --git a/src/multimedia/base/qgraphicsvideoitem.cpp b/src/multimedia/base/qgraphicsvideoitem.cpp
index d5ca9e8..f903eb7 100644
--- a/src/multimedia/base/qgraphicsvideoitem.cpp
+++ b/src/multimedia/base/qgraphicsvideoitem.cpp
@@ -410,9 +410,28 @@ void QGraphicsVideoItem::paint(
 */
 QVariant QGraphicsVideoItem::itemChange(GraphicsItemChange change, const QVariant &value)
 {
-    return QGraphicsItem::itemChange(change, value);
+    return QGraphicsObject::itemChange(change, value);
 }
 
-QT_END_NAMESPACE
+/*!
+    \reimp
 
+    \internal
+*/
+bool QGraphicsVideoItem::event(QEvent *event)
+{
+    return QGraphicsObject::event(event);
+}
+
+/*!
+    \reimp
+
+    \internal
+*/
+bool QGraphicsVideoItem::sceneEvent(QEvent *event)
+{
+    return QGraphicsObject::sceneEvent(event);
+}
+
+QT_END_NAMESPACE
 #include "moc_qgraphicsvideoitem.cpp"
diff --git a/src/multimedia/base/qgraphicsvideoitem.h b/src/multimedia/base/qgraphicsvideoitem.h
index c339606..e6f0d81 100644
--- a/src/multimedia/base/qgraphicsvideoitem.h
+++ b/src/multimedia/base/qgraphicsvideoitem.h
@@ -90,6 +90,9 @@ Q_SIGNALS:
     void nativeSizeChanged(const QSizeF &size);
 
 protected:
+    bool event(QEvent *event);
+    bool sceneEvent(QEvent *event);
+
     QVariant itemChange(GraphicsItemChange change, const QVariant &value);
 
     QGraphicsVideoItemPrivate *d_ptr;