Merge branch 'dev' into stable

This starts Qt 5.1 release cycle

Change-Id: I6178a580b4c99aded1a69032a02169cff502b71d

1 files changed, 2 insertions, 1 deletions

diff --git a/examples/quick/demos/photoviewer/PhotoViewerCore/AlbumDelegate.qml b/examples/quick/demos/photoviewer/PhotoViewerCore/AlbumDelegate.qml
index 4bd5e33ae3..d94231c9b5 100644
--- a/examples/quick/demos/photoviewer/PhotoViewerCore/AlbumDelegate.qml
+++ b/examples/quick/demos/photoviewer/PhotoViewerCore/AlbumDelegate.qml
@@ -41,6 +41,7 @@
 
 import QtQuick 2.0
 import QtQuick.XmlListModel 2.0
+import QtQml.Models 2.1
 
 Component {
     id: albumDelegate
@@ -69,7 +70,7 @@ Component {
             Package.name: 'album'
             id: albumWrapper; width: 210; height: 220
 
-            VisualDataModel {
+            DelegateModel {
                 id: visualModel; delegate: PhotoDelegate { }
                 model: RssModel { id: rssModel; tags: tag }
             }