diff options
| author | Yoann Lopes <yoann.lopes@qt.io> | 2016-09-23 08:44:50 +0300 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@qt.io> | 2016-09-23 08:47:15 +0300 |
| commit | 0d3434fd0491d8d37dc0286b9d8ec8a454ba726b (patch) | |
| tree | 329557ed14a161827817765b0ccc6298fcf146b4 /src/imports | |
| parent | 01c9322bfe918b886468eb520d77b21b6d8c0c11 (diff) | |
| parent | 62eeaba645d0f7c42246a0b026c532919a5b0454 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Change-Id: I96aca24df935d51b40380c727b6c5002432a6be6
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; |