diff options
| author | Martin Jones <martin.jones@nokia.com> | 2011-01-11 00:55:14 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2011-01-11 00:55:14 (GMT) |
| commit | 7ca750fad4e74929c9c34a98c19bde37747a9dc5 (patch) | |
| tree | 9918f7ac4660ff0106b8f8f78be0559b6ba3c812 /src/declarative | |
| parent | 7d43a31902ca6d2132004c45db313194c9669bb6 (diff) | |
| download | Qt-7ca750fad4e74929c9c34a98c19bde37747a9dc5.zip Qt-7ca750fad4e74929c9c34a98c19bde37747a9dc5.tar.gz Qt-7ca750fad4e74929c9c34a98c19bde37747a9dc5.tar.bz2 | |
Add versioning for new Flickable methods.
Task-number: QTBUG-15148
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeflickable_p.h | 5 | ||||
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable_p.h b/src/declarative/graphicsitems/qdeclarativeflickable_p.h index ece2db7..4d3da92 100644 --- a/src/declarative/graphicsitems/qdeclarativeflickable_p.h +++ b/src/declarative/graphicsitems/qdeclarativeflickable_p.h @@ -149,9 +149,8 @@ public: FlickableDirection flickableDirection() const; void setFlickableDirection(FlickableDirection); - //XXX Added in QtQuick 1.1 - Q_INVOKABLE void resizeContent(qreal w, qreal h, QPointF center); - Q_INVOKABLE void returnToBounds(); + Q_INVOKABLE Q_REVISION(1) void resizeContent(qreal w, qreal h, QPointF center); + Q_INVOKABLE Q_REVISION(1) void returnToBounds(); Q_SIGNALS: void contentWidthChanged(); diff --git a/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp b/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp index 0d386c6..ddbde0b 100644 --- a/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp +++ b/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp @@ -179,6 +179,7 @@ void QDeclarativeItemModule::defineModule() qmlRegisterType<QDeclarativePinchArea>("QtQuick",1,1,"PinchArea"); qmlRegisterType<QDeclarativePinch>("QtQuick",1,1,"Pinch"); qmlRegisterType<QDeclarativePinchEvent>(); + qmlRegisterType<QDeclarativeFlickable,1>("QtQuick",1,1,"Flickable"); qmlRegisterType<QDeclarativeRepeater,1>("QtQuick",1,1,"Repeater"); qmlRegisterType<QDeclarativeTextEdit,1>("QtQuick",1,1,"TextEdit"); #ifndef QT_NO_LINEEDIT |