diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-19 03:00:50 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-19 03:00:50 +0200 |
commit | f7718df35ab638b5c5b0301bb25e3c3d9c3d406b (patch) | |
tree | 73614000ac01a3ff36519276d32c65440adee29b /src/multimedia/configure.json | |
parent | 4ccf53d67df088ba9fe8189a4349b08d8c947893 (diff) | |
parent | 6a58bc056daabc21b355b2588457b3b2a2142b1f (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I1c1838c15621a37fa58cf4102521a94590c35c5d
Diffstat (limited to 'src/multimedia/configure.json')
-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", |