summaryrefslogtreecommitdiffstats
path: root/src/plugins/videonode
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@digia.com>2014-11-18 14:07:34 +0100
committerJani Heikkinen <jani.heikkinen@theqtcompany.com>2014-11-18 18:09:09 +0100
commit96407d8d8980f5dee7a0848366c20584dbd8c321 (patch)
tree7f8fdc1bff098a1c562a6aaf47057de6b164ce7b /src/plugins/videonode
parentb369746ae7b1b1148c863fb8a20fb229e277b7c4 (diff)
Fix bogus videonode plugin handlingv5.4.0-rc1
Each plugin must provide its own unique key. Otherwise we will only ever see one single plugin. Right now running on i.MX6 is often broken because the imx6 videonode plugin is not picked up since only the egl one is seen by the system. With the fix both plugins provide their own unique key so both become visible. Additionally, introduce a QT_VIDEONODE environment variable. This is useful to specify which plugin to use. This is necessary in case multiple custom videonode plugins support the same formats. Change-Id: Iaa1988f8436dcb938cb9a95e2e0d68a4e92e113c Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
Diffstat (limited to 'src/plugins/videonode')
-rw-r--r--src/plugins/videonode/egl/egl.json2
-rw-r--r--src/plugins/videonode/imx6/imx6.json2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/videonode/egl/egl.json b/src/plugins/videonode/egl/egl.json
index 08bb12c3f..54a0519f5 100644
--- a/src/plugins/videonode/egl/egl.json
+++ b/src/plugins/videonode/egl/egl.json
@@ -1,3 +1,3 @@
{
- "Keys": ["sgvideonodes"]
+ "Keys": ["egl"]
}
diff --git a/src/plugins/videonode/imx6/imx6.json b/src/plugins/videonode/imx6/imx6.json
index 08bb12c3f..2a7fc50cc 100644
--- a/src/plugins/videonode/imx6/imx6.json
+++ b/src/plugins/videonode/imx6/imx6.json
@@ -1,3 +1,3 @@
{
- "Keys": ["sgvideonodes"]
+ "Keys": ["imx6"]
}