diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-25 23:27:28 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-25 23:27:28 +0200 |
| commit | 18a8381ab324fce9ed162b63e185eaf541c2c92b (patch) | |
| tree | 541b98ee213d390610000feae5022e6c3243eaaa /src/plugins/directshow | |
| parent | f424e8249b7b83d7d8f5a353161d2cc093840beb (diff) | |
| parent | 1c0cfdf408a398f4fe3efded775341b50106505d (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I9ad818eecef74983e09660871f39ee66a6b666a1
Diffstat (limited to 'src/plugins/directshow')
| -rw-r--r-- | src/plugins/directshow/directshow.json | 3 | ||||
| -rw-r--r-- | src/plugins/directshow/directshow_camera.json | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/directshow/directshow.json b/src/plugins/directshow/directshow.json index 54c1c9f04..b1783b5ed 100644 --- a/src/plugins/directshow/directshow.json +++ b/src/plugins/directshow/directshow.json @@ -1,3 +1,4 @@ { - "Keys": ["org.qt-project.qt.camera", "org.qt-project.qt.mediaplayer"] + "Keys": ["directshow"], + "Services": ["org.qt-project.qt.camera", "org.qt-project.qt.mediaplayer"] } 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"] } |