diff options
| author | Gabriel de Dietrich <gabriel.dietrich-de@nokia.com> | 2011-02-08 11:57:34 +0100 |
|---|---|---|
| committer | Gabriel de Dietrich <gabriel.dietrich-de@nokia.com> | 2011-02-08 11:57:34 +0100 |
| commit | eb7958c65b09569c2531d2c443a6d0fe0b507d97 (patch) | |
| tree | 91544e4a4cf5c65b3acec7c219ebe63176a14994 /src/plugins/phonon/gstreamer/gstreamer.pro | |
| parent | ef998bca70a799806c5754edfa49ea625881bc3e (diff) | |
| parent | 44298c848ac254fe1942eb32eed7651dec5bf0e3 (diff) | |
| download | qt4-tools-eb7958c65b09569c2531d2c443a6d0fe0b507d97.tar.gz | |
Merge branch 'master-upstream'
Diffstat (limited to 'src/plugins/phonon/gstreamer/gstreamer.pro')
| -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 02e0848b96..c0d2604c15 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 } |