summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Cooksey <thomas.cooksey@nokia.com>2010-02-23 12:28:25 (GMT)
committerTom Cooksey <thomas.cooksey@nokia.com>2010-02-23 13:15:44 (GMT)
commitbf5bf41d03d553421e87d01dadda95f4561247a9 (patch)
treea05da3f2c405d44df23a0320c306d9ae8af9a177
parent3fad8ee60949d45bbb78c92cc4cad6cfbded1aae (diff)
downloadQt-bf5bf41d03d553421e87d01dadda95f4561247a9.zip
Qt-bf5bf41d03d553421e87d01dadda95f4561247a9.tar.gz
Qt-bf5bf41d03d553421e87d01dadda95f4561247a9.tar.bz2
Make mediaservices use existing GStreamer qmake vars
This should also allow building when pkg-config isn't present or doesn't work, E.g. when cross-compiling on toolchains lacking pkg-config support. Apparently this also fixes warnings on Solaris too. Reviewed-By: Thiago
-rw-r--r--src/plugins/mediaservices/gstreamer/gstreamer.pro12
-rw-r--r--src/plugins/mediaservices/mediaservices.pro13
2 files changed, 4 insertions, 21 deletions
diff --git a/src/plugins/mediaservices/gstreamer/gstreamer.pro b/src/plugins/mediaservices/gstreamer/gstreamer.pro
index db0ee4e..22e3c16 100644
--- a/src/plugins/mediaservices/gstreamer/gstreamer.pro
+++ b/src/plugins/mediaservices/gstreamer/gstreamer.pro
@@ -8,16 +8,8 @@ unix:contains(QT_CONFIG, alsa) {
LIBS += -lasound
}
-LIBS += -lXv
-
-CONFIG += link_pkgconfig
-
-PKGCONFIG += \
- gstreamer-0.10 \
- gstreamer-base-0.10 \
- gstreamer-interfaces-0.10 \
- gstreamer-audio-0.10 \
- gstreamer-video-0.10
+QMAKE_CXXFLAGS += $$QT_CFLAGS_GSTREAMER
+LIBS += -lXv $$QT_LIBS_GSTREAMER -lgstinterfaces-0.10 -lgstvideo-0.10 -lgstbase-0.10 -lgstaudio-0.10
# Input
HEADERS += \
diff --git a/src/plugins/mediaservices/mediaservices.pro b/src/plugins/mediaservices/mediaservices.pro
index d90ce4b..a8ac39c 100644
--- a/src/plugins/mediaservices/mediaservices.pro
+++ b/src/plugins/mediaservices/mediaservices.pro
@@ -4,15 +4,6 @@ win32:!wince: SUBDIRS += directshow
mac: SUBDIRS += qt7
-unix:!mac:!symbian:contains(QT_CONFIG, xvideo): {
- TMP_GST_LIBS = \
- gstreamer-0.10 >= 0.10.19 \
- gstreamer-base-0.10 >= 0.10.19 \
- gstreamer-interfaces-0.10 >= 0.10.19 \
- gstreamer-audio-0.10 >= 0.10.19 \
- gstreamer-video-0.10 >= 0.10.19
-
- system(pkg-config --exists \'$${TMP_GST_LIBS}\' --print-errors): {
- SUBDIRS += gstreamer
- }
+unix:!mac:!symbian:contains(QT_CONFIG, xvideo):contains(QT_CONFIG, gstreamer) {
+ SUBDIRS += gstreamer
}