diff options
| -rw-r--r-- | qtmultimedia.pro | 34 |
1 files changed, 14 insertions, 20 deletions
diff --git a/qtmultimedia.pro b/qtmultimedia.pro index 84f254861..489589df7 100644 --- a/qtmultimedia.pro +++ b/qtmultimedia.pro @@ -17,28 +17,22 @@ win32 { } else { qtCompileTest(alsa) qtCompileTest(pulseaudio) - !done_config_gstreamer { - gstver=0.10 - !isEmpty(GST_VERSION): gstver=$$GST_VERSION - cache(GST_VERSION, set, gstver); - qtCompileTest(gstreamer) { - qtCompileTest(gstreamer_photography) - qtCompileTest(gstreamer_encodingprofiles) - qtCompileTest(gstreamer_appsrc) - qtCompileTest(linux_v4l) - } else { - 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_encodingprofiles) - qtCompileTest(gstreamer_appsrc) - qtCompileTest(linux_v4l) - } + + isEmpty(GST_VERSION) { + contains(QT_CONFIG, gstreamer-0.10) { + GST_VERSION = 0.10 + } else: contains(QT_CONFIG, gstreamer-1.0) { + GST_VERSION = 1.0 } } + cache(GST_VERSION, set) + !isEmpty(GST_VERSION):qtCompileTest(gstreamer) { + qtCompileTest(gstreamer_photography) + qtCompileTest(gstreamer_encodingprofiles) + qtCompileTest(gstreamer_appsrc) + qtCompileTest(linux_v4l) + } + qtCompileTest(resourcepolicy) qtCompileTest(gpu_vivante) } |