diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2010-12-14 16:08:55 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2011-01-04 14:18:23 (GMT) |
| commit | e90cb6992e35ed4b9c2aae85edb8d787c24a8a6c (patch) | |
| tree | bbdb42dd38a7c68678d103153850eee216f83819 /src/plugins/phonon | |
| parent | d0414bd582190e205aa698f5cb24f1c6909d8222 (diff) | |
| download | Qt-e90cb6992e35ed4b9c2aae85edb8d787c24a8a6c.zip Qt-e90cb6992e35ed4b9c2aae85edb8d787c24a8a6c.tar.gz Qt-e90cb6992e35ed4b9c2aae85edb8d787c24a8a6c.tar.bz2 | |
Fix gstreamer phonon build on X11
I added an x11{ } clause in the pro file for the plugin. But as it
turnes out the x11 clause is defined in gui.pro so it is not available
for use in any other pro or pri files.
Also fixed a missing !qpa in qttest_p4.prf
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 02e0848..c0d2604 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 -x11 { +!qpa:!embedded{ HEADERS += $$PHONON_GSTREAMER_DIR/x11renderer.h SOURCES += $$PHONON_GSTREAMER_DIR/x11renderer.cpp } |