summaryrefslogtreecommitdiffstats
path: root/tests/auto/unit/qmultimedia_common/mockreadonlyplaylistprovider.h
diff options
context:
space:
mode:
authorYoann Lopes <yoann.lopes@theqtcompany.com>2015-10-08 18:26:39 +0200
committerSimon Hausmann <simon.hausmann@theqtcompany.com>2015-12-11 14:53:16 +0000
commit82e135167a5d24f600f006480b78a59511ae5cb3 (patch)
tree0e27d0b2520e42d4b7bfb1db32dd5446df49502f /tests/auto/unit/qmultimedia_common/mockreadonlyplaylistprovider.h
parent94c33684fe3ba3c08af91d5d465c35f5dc706721 (diff)
Change the way a playlist is bound to a media object.v5.6.0-beta1
The previous behavior was to simply switch from the internal control to the service's control, discarding anything that was added to the playlist before binding. We now carry over the changes made to the playlist when switching controls. This means the switch is now transparent to the user. When the service's control is read-only, we cannot transfer the items, which means the user must be notified of the items that might have been "lost" during the switch. Auto-test modified to reflect this change. Change-Id: Ibf80b650b06425ddbaeb320b72ac5d3082a25960 Reviewed-by: Jim Hodapp <jim.hodapp@canonical.com> Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
Diffstat (limited to 'tests/auto/unit/qmultimedia_common/mockreadonlyplaylistprovider.h')
-rw-r--r--tests/auto/unit/qmultimedia_common/mockreadonlyplaylistprovider.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/auto/unit/qmultimedia_common/mockreadonlyplaylistprovider.h b/tests/auto/unit/qmultimedia_common/mockreadonlyplaylistprovider.h
index 50747c1ad..39b1598b0 100644
--- a/tests/auto/unit/qmultimedia_common/mockreadonlyplaylistprovider.h
+++ b/tests/auto/unit/qmultimedia_common/mockreadonlyplaylistprovider.h
@@ -38,7 +38,6 @@
class MockReadOnlyPlaylistProvider : public QMediaPlaylistProvider
{
- Q_OBJECT
public:
MockReadOnlyPlaylistProvider(QObject *parent)
:QMediaPlaylistProvider(parent)