From e25db62a59e86a62990de43f554af3baecdd47ff Mon Sep 17 00:00:00 2001 From: Yoann Lopes Date: Thu, 20 Jun 2013 17:40:11 +0200 Subject: 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 Reviewed-by: Lars Knoll --- src/plugins/directshow/directshow_camera.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/plugins/directshow/directshow_camera.json') 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"] } -- cgit v1.2.3