summaryrefslogtreecommitdiffstats
path: root/src/plugins/mediaservices/gstreamer/gstreamer.pro
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2010-05-19 09:33:21 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2010-05-19 09:33:21 (GMT)
commitebe28bdd77ca615c47ebf6b41e34aee0c154fcf9 (patch)
treea1aa1578f798bae0cc23c32656134628bf5af788 /src/plugins/mediaservices/gstreamer/gstreamer.pro
parent109024630cbf577d6f6bcb10ea3ac6272113b79e (diff)
parent28b894f65c5aba01d5ee80c20f617478faaee7e7 (diff)
downloadQt-ebe28bdd77ca615c47ebf6b41e34aee0c154fcf9.zip
Qt-ebe28bdd77ca615c47ebf6b41e34aee0c154fcf9.tar.gz
Qt-ebe28bdd77ca615c47ebf6b41e34aee0c154fcf9.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src/plugins/mediaservices/gstreamer/gstreamer.pro')
-rw-r--r--src/plugins/mediaservices/gstreamer/gstreamer.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/mediaservices/gstreamer/gstreamer.pro b/src/plugins/mediaservices/gstreamer/gstreamer.pro
index 6af9c3f..6e05120 100644
--- a/src/plugins/mediaservices/gstreamer/gstreamer.pro
+++ b/src/plugins/mediaservices/gstreamer/gstreamer.pro
@@ -36,7 +36,7 @@ SOURCES += \
qvideosurfacegstsink.cpp
-x11 {
+!win32:!embedded:!mac:!symbian {
LIBS += -lXv
HEADERS += \