Use configured GStreamer version.
The gstreamer version detected or set by the configure script can be overridden by passing GST_VERSION=<version> to qmake qtmultimedia.pro. Change-Id: I6f2eac3705d3d6fe0ec8e79042017add6751ee8c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
@@ -17,28 +17,22 @@ win32 {
|
|||||||
} else {
|
} else {
|
||||||
qtCompileTest(alsa)
|
qtCompileTest(alsa)
|
||||||
qtCompileTest(pulseaudio)
|
qtCompileTest(pulseaudio)
|
||||||
!done_config_gstreamer {
|
|
||||||
gstver=0.10
|
isEmpty(GST_VERSION) {
|
||||||
!isEmpty(GST_VERSION): gstver=$$GST_VERSION
|
contains(QT_CONFIG, gstreamer-0.10) {
|
||||||
cache(GST_VERSION, set, gstver);
|
GST_VERSION = 0.10
|
||||||
qtCompileTest(gstreamer) {
|
} else: contains(QT_CONFIG, gstreamer-1.0) {
|
||||||
qtCompileTest(gstreamer_photography)
|
GST_VERSION = 1.0
|
||||||
qtCompileTest(gstreamer_encodingprofiles)
|
}
|
||||||
qtCompileTest(gstreamer_appsrc)
|
}
|
||||||
qtCompileTest(linux_v4l)
|
cache(GST_VERSION, set)
|
||||||
} else {
|
!isEmpty(GST_VERSION):qtCompileTest(gstreamer) {
|
||||||
gstver=1.0
|
|
||||||
cache(GST_VERSION, set, gstver);
|
|
||||||
# Force a re-run of the test
|
|
||||||
CONFIG -= done_config_gstreamer
|
|
||||||
qtCompileTest(gstreamer) {
|
|
||||||
qtCompileTest(gstreamer_photography)
|
qtCompileTest(gstreamer_photography)
|
||||||
qtCompileTest(gstreamer_encodingprofiles)
|
qtCompileTest(gstreamer_encodingprofiles)
|
||||||
qtCompileTest(gstreamer_appsrc)
|
qtCompileTest(gstreamer_appsrc)
|
||||||
qtCompileTest(linux_v4l)
|
qtCompileTest(linux_v4l)
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
qtCompileTest(resourcepolicy)
|
qtCompileTest(resourcepolicy)
|
||||||
qtCompileTest(gpu_vivante)
|
qtCompileTest(gpu_vivante)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user