diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-08 03:03:45 +0200 |
|---|---|---|
| committer | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2019-10-08 07:29:42 +0000 |
| commit | 1cb8dcaa90ab5b7e05cced20772caade74f0461b (patch) | |
| tree | 3a7536e366362952169ca78b03139c925c80c95b /src/multimedia | |
| parent | fa4d01ae128dd5605910bafda580e856239e36c6 (diff) | |
| parent | d2475bdd4cbb9a70abf19db465ddbdbf29591568 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
src/multimedia/configure.json
Change-Id: Ie887a5f4d718cb3e082b0e2ee996c6687af330cb
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/configure.json | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/multimedia/configure.json b/src/multimedia/configure.json index ca2839cea..65d9aee80 100644 --- a/src/multimedia/configure.json +++ b/src/multimedia/configure.json @@ -106,6 +106,18 @@ { "type": "pkgConfig", "args": "gstreamer-gl-1.0" } ] }, + "gstreamer_imxcommon": { + "label": "GStreamer i.MX common", + "export": "gstreamer_imxcommon", + "test": { + "include": "gst/allocators/imx/phys_mem_meta.h" + }, + "use": "gstreamer_1_0", + "sources": [ + { "type": "pkgConfig", + "args": "gstimxcommon" } + ] + }, "libresourceqt5": { "label": "libresourceqt5", "test": "resourcepolicy", @@ -245,6 +257,11 @@ "condition": "features.gstreamer_1_0 && libs.gstreamer_gl_1_0", "output": [ "privateFeature" ] }, + "gstreamer_imxcommon": { + "label": "GStreamer i.MX common", + "condition": "(features.gstreamer_1_0 && libs.gstreamer_imxcommon)", + "output": [ "privateFeature" ] + }, "gpu_vivante": { "label": "Vivante GPU", "condition": "features.gui && features.opengles2 && tests.gpu_vivante", |