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

Conflicts:
	src/declarative/graphicsitems/qdeclarativegridview.cpp
	src/declarative/graphicsitems/qdeclarativelistview.cpp

1 files changed, 0 insertions, 2 deletions

diff --git a/src/declarative/graphicsitems/qdeclarativeloader_p_p.h b/src/declarative/graphicsitems/qdeclarativeloader_p_p.h
index 7f1a6da..2239b16 100644
--- a/src/declarative/graphicsitems/qdeclarativeloader_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeloader_p_p.h
@@ -72,13 +72,11 @@ public:
     void itemGeometryChanged(QDeclarativeItem *item, const QRectF &newGeometry, const QRectF &oldGeometry);
     void clear();
     void initResize();
-    void load();
 
     QUrl source;
     QGraphicsObject *item;
     QDeclarativeComponent *component;
     bool ownComponent : 1;
-    bool isComponentComplete : 1;
 
     void _q_sourceLoaded();
     void _q_updateSize(bool loaderGeometryChanged = true);