diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-23 03:09:51 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-23 03:09:51 (GMT) |
| commit | 6c4a1d0664f74fc9fe0533ca245d75355695e5be (patch) | |
| tree | a055210a51704f4454398b64d6a77e4608210369 /src/declarative/graphicsitems/qdeclarativetext_p.h | |
| parent | 4894e6dd57c31e0196c6fdae4d1b2fb16b9f1b16 (diff) | |
| parent | e24aa4af60718e17405871fb3776107adc0b36f1 (diff) | |
| download | Qt-6c4a1d0664f74fc9fe0533ca245d75355695e5be.zip Qt-6c4a1d0664f74fc9fe0533ca245d75355695e5be.tar.gz Qt-6c4a1d0664f74fc9fe0533ca245d75355695e5be.tar.bz2 | |
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: (144 commits)
Don't crash if Connections::target is changed by one of its signal handlers
Update visual tests after some painter updates.
Add missing Q_DISABLE_COPYs.
Use Q_DECLARE_PRIVATE for private slot.
Workaround no longer needed.
Rename QDeclarativeExpression::value() to evaluate().
Continue to register base type.
Doc.
Remove the deprecated wrap property.
Do not treat images in qml examples differently.
Replace Flickable overshoot property with boundsBehavior
Autotests and doc
Give error on attempt to import types from too-early version number.
Remove (undocumented) QML bindings for effects.
De-straighten them lines.
Doc: fix QStringList model doc (really).
Doc: fix QStringList model docs
Change return type to match value().
Add duration and easing properties to AnchorAnimation.
Autotest
...
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativetext_p.h')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetext_p.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetext_p.h b/src/declarative/graphicsitems/qdeclarativetext_p.h index 4fd5e3a..00ce126 100644 --- a/src/declarative/graphicsitems/qdeclarativetext_p.h +++ b/src/declarative/graphicsitems/qdeclarativetext_p.h @@ -69,7 +69,6 @@ class Q_DECLARATIVE_EXPORT QDeclarativeText : public QDeclarativeItem Q_PROPERTY(HAlignment horizontalAlignment READ hAlign WRITE setHAlign NOTIFY horizontalAlignmentChanged) Q_PROPERTY(VAlignment verticalAlignment READ vAlign WRITE setVAlign NOTIFY verticalAlignmentChanged) Q_PROPERTY(WrapMode wrapMode READ wrapMode WRITE setWrapMode NOTIFY wrapModeChanged) - 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? @@ -123,8 +122,6 @@ public: VAlignment vAlign() const; void setVAlign(VAlignment align); - bool wrap() const; - void setWrap(bool w); WrapMode wrapMode() const; void setWrapMode(WrapMode w); |