diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-27 13:00:02 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-27 13:00:02 +0200 |
commit | 0a3f1aacd38cc447bc85032a4ae2509ae472af94 (patch) | |
tree | 3e0e9278ffa54a06720cf52fcf6f1bdca2a4d46a /src/plugins/gstreamer/mediaplayer/mediaplayer.json | |
parent | 6d40540fceb0aaaeb41c5f686b905277501446a3 (diff) | |
parent | 18a8381ab324fce9ed162b63e185eaf541c2c92b (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I48a140d1bbe82ab65e54683d77aea8c97c06ec80
Diffstat (limited to 'src/plugins/gstreamer/mediaplayer/mediaplayer.json')
-rw-r--r-- | src/plugins/gstreamer/mediaplayer/mediaplayer.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/gstreamer/mediaplayer/mediaplayer.json b/src/plugins/gstreamer/mediaplayer/mediaplayer.json index c4a27ea01..bd1a7e64d 100644 --- a/src/plugins/gstreamer/mediaplayer/mediaplayer.json +++ b/src/plugins/gstreamer/mediaplayer/mediaplayer.json @@ -1,3 +1,4 @@ { - "Keys": ["org.qt-project.qt.mediaplayer"] + "Keys": ["gstreamermediaplayer"], + "Services": ["org.qt-project.qt.mediaplayer"] } |