Make phonon gst backend build properly

Only software rendering for now...

also fix regression I made in QWindowSystemInterface. Its allowed to
send in NULL pointers for tlw in some of the functions. So dont ask for
the widget data of a NULL pointer.

6 files changed, 38 insertions, 28 deletions

diff --git a/src/3rdparty/phonon/gstreamer/devicemanager.cpp b/src/3rdparty/phonon/gstreamer/devicemanager.cpp
index c3826eb..518aa85 100644
--- a/src/3rdparty/phonon/gstreamer/devicemanager.cpp
+++ b/src/3rdparty/phonon/gstreamer/devicemanager.cpp
@@ -22,7 +22,9 @@
 #include "videowidget.h"
 #include "glrenderer.h"
 #include "widgetrenderer.h"
+#ifdef Q_WS_X11
 #include "x11renderer.h"
+#endif
 #include "artssink.h"
 #include "pulsesupport.h"
 
@@ -264,7 +266,7 @@ AbstractRenderer *DeviceManager::createVideoRenderer(VideoWidget *parent)
     if (m_videoSinkWidget == "software") {
         return new WidgetRenderer(parent);
     }
-#ifndef Q_WS_QWS
+#ifdef Q_WS_X11
     else if (m_videoSinkWidget == "xwindow") {
         return new X11Renderer(parent);
     } else {
diff --git a/src/3rdparty/phonon/gstreamer/videowidget.cpp b/src/3rdparty/phonon/gstreamer/videowidget.cpp
index e1f0ec9..a4c6f79 100644
--- a/src/3rdparty/phonon/gstreamer/videowidget.cpp
+++ b/src/3rdparty/phonon/gstreamer/videowidget.cpp
@@ -31,7 +31,9 @@
 
 #include "glrenderer.h"
 #include "widgetrenderer.h"
+#ifdef Q_WS_X11
 #include "x11renderer.h"
+#endif
 
 #ifndef QT_NO_PHONON_VIDEO
 QT_BEGIN_NAMESPACE
@@ -116,10 +118,12 @@ void VideoWidget::setupVideoBin()
             GstPad *videopad = gst_element_get_pad (queue, "sink");
             gst_element_add_pad (m_videoBin, gst_ghost_pad_new ("sink", videopad));
             gst_object_unref (videopad);
+#ifndef Q_WS_QPA
             QWidget *parentWidget = qobject_cast<QWidget*>(parent());
             if (parentWidget)
                 parentWidget->winId();  // Due to some existing issues with alien in 4.4,
                                         //  we must currently force the creation of a parent widget.
+#endif
             m_isValid = true; //initialization ok, accept input
         }
     }
diff --git a/src/3rdparty/phonon/gstreamer/x11renderer.h b/src/3rdparty/phonon/gstreamer/x11renderer.h
index f7140da..8e2ea19 100644
--- a/src/3rdparty/phonon/gstreamer/x11renderer.h
+++ b/src/3rdparty/phonon/gstreamer/x11renderer.h
@@ -27,8 +27,6 @@
 
 QT_BEGIN_NAMESPACE
 
-#ifndef Q_WS_QWS
-
 class QString;
 
 namespace Phonon
@@ -61,8 +59,6 @@ private:
 }
 } //namespace Phonon::Gstreamer
 
-#endif // Q_WS_QWS
-
 QT_END_NAMESPACE
 
 #endif // Phonon_GSTREAMER_X11RENDERER_H
diff --git a/src/gui/kernel/qwindowsysteminterface_qpa.cpp b/src/gui/kernel/qwindowsysteminterface_qpa.cpp
index f10c038..7b83fd3 100644
--- a/src/gui/kernel/qwindowsysteminterface_qpa.cpp
+++ b/src/gui/kernel/qwindowsysteminterface_qpa.cpp
@@ -61,11 +61,11 @@ extern QPointer<QWidget> qt_last_mouse_receiver;
 
 void QWindowSystemInterface::handleEnterEvent(QWidget *tlw)
 {
-    QWidgetData *data = qt_qwidget_data(tlw);
-    if (data->in_destructor)
-        return;
-
     if (tlw) {
+        QWidgetData *data = qt_qwidget_data(tlw);
+        if (data->in_destructor)
+            return;
+
         QWindowSystemInterfacePrivate::EnterEvent *e = new QWindowSystemInterfacePrivate::EnterEvent(tlw);
         QWindowSystemInterfacePrivate::queueWindowSystemEvent(e);
     }
@@ -73,20 +73,22 @@ void QWindowSystemInterface::handleEnterEvent(QWidget *tlw)
 
 void QWindowSystemInterface::handleLeaveEvent(QWidget *tlw)
 {
-    QWidgetData *data = qt_qwidget_data(tlw);
-    if (data->in_destructor)
-        return;
-
+    if (tlw) {
+        QWidgetData *data = qt_qwidget_data(tlw);
+        if (data->in_destructor)
+            return;
+    }
     QWindowSystemInterfacePrivate::LeaveEvent *e = new QWindowSystemInterfacePrivate::LeaveEvent(tlw);
     QWindowSystemInterfacePrivate::queueWindowSystemEvent(e);
 }
 
 void QWindowSystemInterface::handleGeometryChange(QWidget *tlw, const QRect &newRect)
 {
-    QWidgetData *data = qt_qwidget_data(tlw);
-    if (data->in_destructor)
-        return;
-
+    if (tlw) {
+        QWidgetData *data = qt_qwidget_data(tlw);
+        if (data->in_destructor)
+            return;
+    }
     QWindowSystemInterfacePrivate::GeometryChangeEvent *e = new QWindowSystemInterfacePrivate::GeometryChangeEvent(tlw,newRect);
     QWindowSystemInterfacePrivate::queueWindowSystemEvent(e);
 }
@@ -114,9 +116,11 @@ void QWindowSystemInterface::handleMouseEvent(QWidget *w, const QPoint & local,
 
 void QWindowSystemInterface::handleMouseEvent(QWidget *tlw, ulong timestamp, const QPoint & local, const QPoint & global, Qt::MouseButtons b)
 {
-    QWidgetData *data = qt_qwidget_data(tlw);
-    if (data->in_destructor)
-        tlw = 0;
+    if (tlw) {
+        QWidgetData *data = qt_qwidget_data(tlw);
+        if (data->in_destructor)
+            tlw = 0;
+    }
     QWindowSystemInterfacePrivate::MouseEvent * e =
             new QWindowSystemInterfacePrivate::MouseEvent(tlw, timestamp, local, global, b);
     QWindowSystemInterfacePrivate::queueWindowSystemEvent(e);
@@ -129,9 +133,11 @@ void QWindowSystemInterface::handleKeyEvent(QWidget *w, QEvent::Type t, int k, Q
 
 void QWindowSystemInterface::handleKeyEvent(QWidget *tlw, ulong timestamp, QEvent::Type t, int k, Qt::KeyboardModifiers mods, const QString & text, bool autorep, ushort count)
 {
-    QWidgetData *data = qt_qwidget_data(tlw);
-    if (data->in_destructor)
-        tlw = 0;
+    if (tlw) {
+        QWidgetData *data = qt_qwidget_data(tlw);
+        if (data->in_destructor)
+            tlw = 0;
+    }
 
     QWindowSystemInterfacePrivate::KeyEvent * e =
             new QWindowSystemInterfacePrivate::KeyEvent(tlw, timestamp, t, k, mods, text, autorep, count);
@@ -145,9 +151,11 @@ void QWindowSystemInterface::handleWheelEvent(QWidget *w, const QPoint & local,
 
 void QWindowSystemInterface::handleWheelEvent(QWidget *tlw, ulong timestamp, const QPoint & local, const QPoint & global, int d, Qt::Orientation o)
 {
-    QWidgetData *data = qt_qwidget_data(tlw);
-    if (data->in_destructor)
-        tlw = 0;
+    if (tlw) {
+        QWidgetData *data = qt_qwidget_data(tlw);
+        if (data->in_destructor)
+            tlw = 0;
+    }
 
     QWindowSystemInterfacePrivate::WheelEvent *e =
             new QWindowSystemInterfacePrivate::WheelEvent(tlw, timestamp, local, global, d, o);
diff --git a/src/plugins/phonon/gstreamer/gstreamer.pro b/src/plugins/phonon/gstreamer/gstreamer.pro
index 1013205..02e0848 100644
--- a/src/plugins/phonon/gstreamer/gstreamer.pro
+++ b/src/plugins/phonon/gstreamer/gstreamer.pro
@@ -58,7 +58,7 @@ SOURCES += $$PHONON_GSTREAMER_DIR/abstractrenderer.cpp \
  $$PHONON_GSTREAMER_DIR/volumefadereffect.cpp \
  $$PHONON_GSTREAMER_DIR/widgetrenderer.cpp
 
-!embedded {
+x11 {
     HEADERS += $$PHONON_GSTREAMER_DIR/x11renderer.h
     SOURCES += $$PHONON_GSTREAMER_DIR/x11renderer.cpp
 }
diff --git a/src/plugins/platforms/testlite/qtestlitewindowsurface.cpp b/src/plugins/platforms/testlite/qtestlitewindowsurface.cpp
index 53f4791..b3232c8 100644
--- a/src/plugins/platforms/testlite/qtestlitewindowsurface.cpp
+++ b/src/plugins/platforms/testlite/qtestlitewindowsurface.cpp
@@ -180,7 +180,7 @@ void QTestLiteWindowSurface::flush(QWidget *widget, const QRegion &region, const
     }
 #else
     // Use MIT_SHM
-    if (image_info->image) {
+    if (image_info && image_info->image) {
         //qDebug() << "Here we go" << image_info->image->width << image_info->image->height;
         int x = 0;
         int y = 0;