Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (100 commits)
  Remove test in .pro file also
  Remove unneeded #include and add needed header to .pri
  Add easing changes to QmlChanges.txt
  Update more animation on property value source docs.
  Doc fixes.
  QmlChanges.txt cleanup.
  Remove WorkerListModel and integrate its functionality into ListModel.
  Split post alpha API changes into a separate section.
  Optimize drawPixmapFragments for the GL2 paint engine.
  Optimize  QRegion::intersects(QRect).
  Compile with user defined Qt namespace
  Fix regression from previous commit
  Import "content" with as qualifier to support network without qmldir
  Small fixes to photoviewer demo
  Little more doc on QabstractItemModel and QML.
  Fix benchmark.
  Add basic QUrl benchmarks.
  Add busy indicator to photoviewer demo
  Set maximumExtents correctly for highlightRangeMode: StrictlyEnforceRange
  fix installation of imports libraries
  ...

1 files changed, 47 insertions, 0 deletions

diff --git a/demos/declarative/photoviewer/photoviewer.qml b/demos/declarative/photoviewer/photoviewer.qml
new file mode 100644
index 0000000..5ce02f3
--- /dev/null
+++ b/demos/declarative/photoviewer/photoviewer.qml
@@ -0,0 +1,47 @@
+import Qt 4.6
+import PhotoViewerCore 1.0
+
+Rectangle {
+    id: mainWindow
+
+    property real downloadProgress: 0
+    property bool imageLoading: false
+
+    width: 800; height: 480; color: "#d5d6d8"
+
+    Script { source: "PhotoViewerCore/script/script.js" }
+
+    ListModel {
+        id: photosModel
+        ListElement { tag: "Flowers" }
+        ListElement { tag: "Savanna" }
+        ListElement { tag: "Central Park" }
+    }
+
+    VisualDataModel { id: albumVisualModel; model: photosModel; delegate: AlbumDelegate {} }
+
+    GridView {
+        width: parent.width; height: parent.height; cellWidth: 210; cellHeight: 220; model: albumVisualModel.parts.album
+        visible: albumsShade.opacity != 1.0
+    }
+
+    Rectangle {
+        id: albumsShade; color: mainWindow.color
+        width: parent.width; height: parent.height; opacity: 0.0
+    }
+
+    ListView { anchors.fill: parent; model: albumVisualModel.parts.browser; interactive: false }
+
+    Tag { id: backTag; label: "Back"; rotation: 3; x: parent.width - backTag.width - 6; y: -backTag.height - 8 }
+
+    Rectangle { id: photosShade; color: 'black'; width: parent.width; height: parent.height; opacity: 0; visible: opacity != 0.0 }
+
+    ListView { anchors.fill: parent; model: albumVisualModel.parts.fullscreen; interactive: false }
+
+    Item { id: foreground; anchors.fill: parent }
+
+    ProgressBar {
+        progress: mainWindow.downloadProgress; width: parent.width; height: 4
+        anchors.bottom: parent.bottom; opacity: mainWindow.imageLoading; visible: opacity != 0.0
+    }
+}