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.

3 files changed, 7 insertions, 5 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