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: (136 commits)
  Make QDeclarativeListProperty a class
  Fix qdeclarativedom::loadDynamicProperty test
  Correctly parent repeater items.
  Make sure cursor delegate is parented.
  Allow just one dimension to be set, the other scaled accordingly
  Simplify import path.
  Removed unneeded code.
  Update autotest a little
  Improve QML compiler statistics
  Use error enum not numbers
  Pass test.
  doc
  test error code too
  QDeclarativeItem::setParentItem should not modify the QObject parent
  Doc
  Ensure currentIndex is updated when PathView items are removed/moved
  Visual test fixes.
  Doc
  Relayout items when Flow size changes.
  Make sure the image reader thread is shutdown properly
  ...

1 files changed, 6 insertions, 3 deletions

diff --git a/src/declarative/util/qdeclarativepixmapcache_p.h b/src/declarative/util/qdeclarativepixmapcache_p.h
index b8949db..df71d65 100644
--- a/src/declarative/util/qdeclarativepixmapcache_p.h
+++ b/src/declarative/util/qdeclarativepixmapcache_p.h
@@ -66,6 +66,9 @@ public:
     Status status() const;
 
     const QUrl &url() const;
+    int forcedWidth() const;
+    int forcedHeight() const;
+    QSize implicitSize() const;
 
 Q_SIGNALS:
     void finished();
@@ -81,7 +84,7 @@ private:
     void setLoading();
 
 private:
-    QDeclarativePixmapReply(QDeclarativeImageReader *reader, const QUrl &url);
+    QDeclarativePixmapReply(QDeclarativeImageReader *reader, const QUrl &url, int req_width, int req_height);
     Q_DISABLE_COPY(QDeclarativePixmapReply)
     Q_DECLARE_PRIVATE(QDeclarativePixmapReply)
     friend class QDeclarativeImageRequestHandler;
@@ -92,8 +95,8 @@ private:
 class Q_DECLARATIVE_EXPORT QDeclarativePixmapCache
 {
 public:
-    static QDeclarativePixmapReply::Status get(const QUrl& url, QPixmap *pixmap, bool async=false);
-    static QDeclarativePixmapReply *request(QDeclarativeEngine *, const QUrl& url);
+    static QDeclarativePixmapReply::Status get(const QUrl& url, QPixmap *pixmap, QSize *impsize=0, bool async=false, int req_width=0, int req_height=0);
+    static QDeclarativePixmapReply *request(QDeclarativeEngine *, const QUrl& url, int req_width=0, int req_height=0);
     static void cancel(const QUrl& url, QObject *obj);
     static int pendingRequests();
 };