diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-05 01:15:40 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-05 01:15:40 (GMT) |
| commit | 1cdaca2823a7c09f377ab205e6424e35febcbf2c (patch) | |
| tree | 559c1f8c8ea2109945580fe118a6aa213c1eb349 /src/gui | |
| parent | 8a026d93a76a61415b4d697991cdd8aee6b76cb9 (diff) | |
| parent | 5048b96a14b61329257e153f2551b6fca4519f84 (diff) | |
| download | Qt-1cdaca2823a7c09f377ab205e6424e35febcbf2c.zip Qt-1cdaca2823a7c09f377ab205e6424e35febcbf2c.tar.gz Qt-1cdaca2823a7c09f377ab205e6424e35febcbf2c.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: (104 commits)
Include QML doc snippets in examples autotest
Update QML documentation snippets to latest syntax.
MouseRegion is dead. Long live MouseArea.
Compile fix for wince
Update QML PropertyAnimation::easing docs
Add testcase for QTBUG-7730
Add autotests for tab and backtab in Keys and KeyNavigation.
Run signal expressions on attached property objects in correct scope
Fixup test
Add support for tab and backtab in KeyNavigation
Mark QGraphicsItem position properties as FINAL
Move the multimedia files to the correct place.
Fix grammar stringifying "on" as "readonly"
Improve grouped property error messages
Don't mess with highlight size if highlightFollowsCurrentItem is false.
Fix ListView contentHeight calculation.
Remove Qt.playSound()
Add formatting functions to QML's global Qt object.
Signal handler requires exactly one value.
QDeclarativeContext::contextProperty() should also access ids
...
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsitem.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem.h b/src/gui/graphicsview/qgraphicsitem.h index d72833b..56f94a2 100644 --- a/src/gui/graphicsview/qgraphicsitem.h +++ b/src/gui/graphicsview/qgraphicsitem.h @@ -540,10 +540,10 @@ class Q_GUI_EXPORT QGraphicsObject : public QObject, public QGraphicsItem Q_PROPERTY(qreal opacity READ opacity WRITE setOpacity NOTIFY opacityChanged FINAL) Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged) Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged FINAL) - Q_PROPERTY(QPointF pos READ pos WRITE setPos) - Q_PROPERTY(qreal x READ x WRITE setX NOTIFY xChanged) - Q_PROPERTY(qreal y READ y WRITE setY NOTIFY yChanged) - Q_PROPERTY(qreal z READ zValue WRITE setZValue NOTIFY zChanged) + Q_PROPERTY(QPointF pos READ pos WRITE setPos FINAL) + Q_PROPERTY(qreal x READ x WRITE setX NOTIFY xChanged FINAL) + Q_PROPERTY(qreal y READ y WRITE setY NOTIFY yChanged FINAL) + Q_PROPERTY(qreal z READ zValue WRITE setZValue NOTIFY zChanged FINAL) Q_PROPERTY(qreal rotation READ rotation WRITE setRotation NOTIFY rotationChanged) Q_PROPERTY(qreal scale READ scale WRITE setScale NOTIFY scaleChanged) Q_PROPERTY(QPointF transformOriginPoint READ transformOriginPoint WRITE setTransformOriginPoint) |