diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2010-09-03 12:45:43 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2010-09-07 14:36:11 (GMT) |
| commit | 8a92433b5deb14a27457715241b14764c28ffb39 (patch) | |
| tree | 611588a2d1cabc15676594c2fada9bf36d301a5a /src/plugins/phonon | |
| parent | c5fe294667d9d8dfcec5c9529185a13ba5a47e91 (diff) | |
| download | Qt-8a92433b5deb14a27457715241b14764c28ffb39.zip Qt-8a92433b5deb14a27457715241b14764c28ffb39.tar.gz Qt-8a92433b5deb14a27457715241b14764c28ffb39.tar.bz2 | |
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.
Diffstat (limited to 'src/plugins/phonon')
| -rw-r--r-- | src/plugins/phonon/gstreamer/gstreamer.pro | 2 |
1 files changed, 1 insertions, 1 deletions
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 } |