diff options
| author | Yoann Lopes <yoann.lopes@qt.io> | 2016-09-22 18:40:28 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-09-22 18:40:28 +0000 |
| commit | 62eeaba645d0f7c42246a0b026c532919a5b0454 (patch) | |
| tree | 908caa55b9b4b8603f2da5544e18a18e9b98cf8a /src/imports | |
| parent | 0fd79396510501dfb1dad24bfd51147d364d919c (diff) | |
| parent | 7de936f6b3c428095d71db940ef08e532133b084 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
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; |