summaryrefslogtreecommitdiffstats
path: root/src/plugins/directshow/directshow_camera.json
diff options
context:
space:
mode:
authorYoann Lopes <yoann.lopes@digia.com>2013-06-20 17:40:11 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-06-21 12:07:00 +0200
commite25db62a59e86a62990de43f554af3baecdd47ff (patch)
treeb3356c64c0d168a33a151e43da27caa3f25389d2 /src/plugins/directshow/directshow_camera.json
parent16a775d47a69913ce4f0306531c97469066ea896 (diff)
Multimedia plugins now have a unique JSON metadata 'Keys' property.
They previously had the multimedia services they provided as keys. This was a problem when several plugins were available on the same platform, providing the same multimedia service, but with different features or capabilities. Since they had the same key, only the first plugin in the directory was loaded. Nevertheless, it was actually working until commit 732dcfe7 in qtbase, as all plugins were loaded even when sharing the same key. The services a multimedia plugin provides are now declared in the 'Services' property. To preserve compatibility with third-party plugins, if that new property doesn't exist it falls back to the 'Keys' property. Task-number: QTBUG-31868 Task-number: QTBUG-31476 Change-Id: Ic3ba32eeef21b69b922bd3d4feb111101559d132 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/plugins/directshow/directshow_camera.json')
-rw-r--r--src/plugins/directshow/directshow_camera.json3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/directshow/directshow_camera.json b/src/plugins/directshow/directshow_camera.json
index d3a58c758..c37ce2c9a 100644
--- a/src/plugins/directshow/directshow_camera.json
+++ b/src/plugins/directshow/directshow_camera.json
@@ -1,3 +1,4 @@
{
- "Keys": ["org.qt-project.qt.camera"]
+ "Keys": ["directshow"],
+ "Services": ["org.qt-project.qt.camera"]
}