diff options
| author | Yoann Lopes <yoann.lopes@qt.io> | 2016-09-22 08:45:35 +0300 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@qt.io> | 2016-09-22 08:45:35 +0300 |
| commit | 7de936f6b3c428095d71db940ef08e532133b084 (patch) | |
| tree | 73c2368b9d62d84812d6c65426b9100f14e704e7 /src/imports | |
| parent | 256ee311b936d69561e97f7f8ee832cff93cb509 (diff) | |
| parent | 7d00a457e455e159a3dde30ad798be744cf38bb1 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I5bce2843ac62bb97efc1ccaaa9c671c4adf10640
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; |