summaryrefslogtreecommitdiffstats
path: root/config.tests
diff options
context:
space:
mode:
authorYoann Lopes <yoann.lopes@theqtcompany.com>2014-11-20 17:54:18 +0100
committerAndrew den Exter <andrew.den.exter@qinetic.com.au>2014-11-27 23:30:05 +0100
commit108dda7a90bd0f0337358b0db47ae55acd16dea6 (patch)
treee74c44c004b257fb99fdc96063641c76ac0426cf /config.tests
parent7e3d69668e3f04110a651dee1850a1d0c885947b (diff)
GStreamer: port to 1.0.
0.10 is still used by default. To enable GStreamer 1.0, pass GST_VERSION=1.0 to qmake for qtmultimedia.pro. Contributions from: Andrew den Exter <andrew.den.exter@qinetic.com.au> Ilya Smelykh <ilya@videoexpertsgroup.com> Jim Hodapp <jim.hodapp@canonical.com> Sergio Schvezov <sergio.schvezov@canonical.com> Change-Id: I72a46d1170a8794a149bdb5e20767afcc5b7587c Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
Diffstat (limited to 'config.tests')
-rw-r--r--config.tests/gstreamer/gstreamer.pro11
-rw-r--r--config.tests/gstreamer_appsrc/gstreamer_appsrc.pro13
-rw-r--r--config.tests/gstreamer_encodingprofiles/gstreamer_encodingprofiles.pro13
-rw-r--r--config.tests/gstreamer_photography/gstreamer_photography.pro15
4 files changed, 23 insertions, 29 deletions
diff --git a/config.tests/gstreamer/gstreamer.pro b/config.tests/gstreamer/gstreamer.pro
index 02a7e3406..6b9843ac3 100644
--- a/config.tests/gstreamer/gstreamer.pro
+++ b/config.tests/gstreamer/gstreamer.pro
@@ -3,11 +3,10 @@ SOURCES += main.cpp
CONFIG += link_pkgconfig
PKGCONFIG += \
- gstreamer-0.10 \
- gstreamer-base-0.10 \
- gstreamer-interfaces-0.10 \
- gstreamer-audio-0.10 \
- gstreamer-video-0.10 \
- gstreamer-pbutils-0.10
+ gstreamer-$$GST_VERSION \
+ gstreamer-base-$$GST_VERSION \
+ gstreamer-audio-$$GST_VERSION \
+ gstreamer-video-$$GST_VERSION \
+ gstreamer-pbutils-$$GST_VERSION
diff --git a/config.tests/gstreamer_appsrc/gstreamer_appsrc.pro b/config.tests/gstreamer_appsrc/gstreamer_appsrc.pro
index 9f6170368..0f3ca2b17 100644
--- a/config.tests/gstreamer_appsrc/gstreamer_appsrc.pro
+++ b/config.tests/gstreamer_appsrc/gstreamer_appsrc.pro
@@ -3,11 +3,8 @@ SOURCES += main.cpp
CONFIG += link_pkgconfig
PKGCONFIG += \
- gstreamer-0.10 \
- gstreamer-base-0.10 \
- gstreamer-interfaces-0.10 \
- gstreamer-audio-0.10 \
- gstreamer-video-0.10 \
- gstreamer-app-0.10
-
-
+ gstreamer-$$GST_VERSION \
+ gstreamer-base-$$GST_VERSION \
+ gstreamer-audio-$$GST_VERSION \
+ gstreamer-video-$$GST_VERSION \
+ gstreamer-pbutils-$$GST_VERSION
diff --git a/config.tests/gstreamer_encodingprofiles/gstreamer_encodingprofiles.pro b/config.tests/gstreamer_encodingprofiles/gstreamer_encodingprofiles.pro
index 7e8a9e7a2..fad40b0bd 100644
--- a/config.tests/gstreamer_encodingprofiles/gstreamer_encodingprofiles.pro
+++ b/config.tests/gstreamer_encodingprofiles/gstreamer_encodingprofiles.pro
@@ -2,11 +2,10 @@ SOURCES += main.cpp
CONFIG += link_pkgconfig
-PKGCONFIG += \
- gstreamer-0.10 \
- gstreamer-base-0.10 \
- gstreamer-interfaces-0.10 \
- gstreamer-audio-0.10 \
- gstreamer-video-0.10 \
- gstreamer-pbutils-0.10
+PKGCONFIG += \
+ gstreamer-$$GST_VERSION \
+ gstreamer-base-$$GST_VERSION \
+ gstreamer-audio-$$GST_VERSION \
+ gstreamer-video-$$GST_VERSION \
+ gstreamer-pbutils-$$GST_VERSION
diff --git a/config.tests/gstreamer_photography/gstreamer_photography.pro b/config.tests/gstreamer_photography/gstreamer_photography.pro
index 6b530cb78..975991f93 100644
--- a/config.tests/gstreamer_photography/gstreamer_photography.pro
+++ b/config.tests/gstreamer_photography/gstreamer_photography.pro
@@ -3,12 +3,11 @@ SOURCES += main.cpp
CONFIG += link_pkgconfig
PKGCONFIG += \
- gstreamer-0.10 \
- gstreamer-base-0.10 \
- gstreamer-interfaces-0.10 \
- gstreamer-audio-0.10 \
- gstreamer-video-0.10 \
- gstreamer-pbutils-0.10
-
-LIBS += -lgstphotography-0.10
+ gstreamer-$$GST_VERSION \
+ gstreamer-base-$$GST_VERSION \
+ gstreamer-audio-$$GST_VERSION \
+ gstreamer-video-$$GST_VERSION \
+ gstreamer-pbutils-$$GST_VERSION
+
+LIBS += -lgstphotography-$$GST_VERSION