diff options
author | Thierry Bastian <thierry.bastian@nokia.com> | 2011-01-20 11:38:03 +0100 |
---|---|---|
committer | Thierry Bastian <thierry.bastian@nokia.com> | 2011-01-20 11:38:03 +0100 |
commit | ef998bca70a799806c5754edfa49ea625881bc3e (patch) | |
tree | 2f1ec89d331283cfe53c0cdf5e287683960953e0 /src/declarative/graphicsitems/qdeclarativeloader_p_p.h | |
parent | 43f8762367fa6ffc228ae6e97192766475b02ac0 (diff) | |
parent | 78a927cd7b93ae3fadd272cab9ee594a1369cea4 (diff) | |
download | qt4-tools-ef998bca70a799806c5754edfa49ea625881bc3e.tar.gz |
Merge branch 'master-upstream' into master-water
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativeloader_p_p.h')
-rw-r--r-- | src/declarative/graphicsitems/qdeclarativeloader_p_p.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeloader_p_p.h b/src/declarative/graphicsitems/qdeclarativeloader_p_p.h index 0d4c4d0f44..81ca66dc0e 100644 --- a/src/declarative/graphicsitems/qdeclarativeloader_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativeloader_p_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -72,11 +72,13 @@ 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); |