diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-04-15 06:41:15 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-04-15 06:41:15 (GMT) |
| commit | d8a49ccfb8308aec11cd24e823c297ef157cc4c6 (patch) | |
| tree | 18fc19e36264839be851553a892480ce575da11e /src/declarative/graphicsitems/qdeclarativetext_p.h | |
| parent | 30a3e78a12b72ab6f67992ec2f06cd4f21a01a6c (diff) | |
| parent | 62e52a19f1c7ac81a36f394e43f916c3c8933e8f (diff) | |
| download | Qt-d8a49ccfb8308aec11cd24e823c297ef157cc4c6.zip Qt-d8a49ccfb8308aec11cd24e823c297ef157cc4c6.tar.gz Qt-d8a49ccfb8308aec11cd24e823c297ef157cc4c6.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativetext_p.h')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetext_p.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetext_p.h b/src/declarative/graphicsitems/qdeclarativetext_p.h index 871c833..fcad898 100644 --- a/src/declarative/graphicsitems/qdeclarativetext_p.h +++ b/src/declarative/graphicsitems/qdeclarativetext_p.h @@ -72,6 +72,7 @@ class Q_DECLARATIVE_EXPORT QDeclarativeText : public QDeclarativeItem Q_PROPERTY(bool wrap READ wrap WRITE setWrap NOTIFY wrapModeChanged) Q_PROPERTY(TextFormat textFormat READ textFormat WRITE setTextFormat NOTIFY textFormatChanged) Q_PROPERTY(TextElideMode elide READ elideMode WRITE setElideMode NOTIFY elideModeChanged) //### elideMode? + Q_PROPERTY(int resourcesLoading READ resourcesLoading NOTIFY resourcesLoadingChanged) public: QDeclarativeText(QDeclarativeItem *parent=0); @@ -138,6 +139,8 @@ public: virtual void componentComplete(); + int resourcesLoading() const; + Q_SIGNALS: void textChanged(const QString &text); void linkActivated(const QString &link); @@ -150,6 +153,7 @@ Q_SIGNALS: void wrapModeChanged(); void textFormatChanged(TextFormat textFormat); void elideModeChanged(TextElideMode mode); + void resourcesLoadingChanged(); protected: void mousePressEvent(QGraphicsSceneMouseEvent *event); @@ -160,6 +164,9 @@ protected: private: Q_DISABLE_COPY(QDeclarativeText) Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QDeclarativeText) + + friend class QTextDocumentWithImageResources; + void reloadWithResources(); }; QT_END_NAMESPACE |