diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-11 07:45:03 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-11 07:45:03 +0200 |
| commit | 1c6c85cd7c619cc15c099ae63a5d22bcf661847c (patch) | |
| tree | 5a803feb71e725853317ee1df50a19afe3c87e7a /src/imports | |
| parent | 4d3dae3fa63d64cc97226969c4bf7d6d91b63b57 (diff) | |
| parent | 20e65d4dbd43d133d663b4733ffb09629935e731 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: I7291f7a3bd5851eafe2bf0a4bd5c5f8e705a90bc
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/multimedia/qdeclarativeplaylist.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/imports/multimedia/qdeclarativeplaylist.cpp b/src/imports/multimedia/qdeclarativeplaylist.cpp index b338c33e5..e8df8c376 100644 --- a/src/imports/multimedia/qdeclarativeplaylist.cpp +++ b/src/imports/multimedia/qdeclarativeplaylist.cpp @@ -94,9 +94,6 @@ void QDeclarativePlaylistItem::setSource(const QUrl &source) item's source URL can be accessed using the \c source role. \qml - import QtQuick 2.0 - import QtMultimedia 5.6 - Item { width: 400; height: 300; |