diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2009-11-05 05:01:16 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2009-11-05 05:01:16 (GMT) |
| commit | 085dd75830357b359abf53b7d37c049cdd17977c (patch) | |
| tree | 67795686c5afdeac7d1eebde5a66dfa330353283 /src/declarative/graphicsitems/qmlgraphicsflickable.cpp | |
| parent | aa6f6174374e0abfe94f37ccefce2d0e2b5fe13e (diff) | |
| parent | e4e3b8f336b6c7d0dd52d4b8af96fee1dc628783 (diff) | |
| download | Qt-085dd75830357b359abf53b7d37c049cdd17977c.zip Qt-085dd75830357b359abf53b7d37c049cdd17977c.tar.gz Qt-085dd75830357b359abf53b7d37c049cdd17977c.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/graphicsitems/qmlgraphicsflickable.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qmlgraphicsflickable.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/graphicsitems/qmlgraphicsflickable.cpp b/src/declarative/graphicsitems/qmlgraphicsflickable.cpp index 19c5abc..c7332f9 100644 --- a/src/declarative/graphicsitems/qmlgraphicsflickable.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsflickable.cpp @@ -341,7 +341,7 @@ void QmlGraphicsFlickablePrivate::updateBeginningEnd() visibleArea->updateVisible(); } -QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Flickable,QmlGraphicsFlickable) +QML_DEFINE_TYPE(Qt,4,6,Flickable,QmlGraphicsFlickable) /*! \qmlclass Flickable QmlGraphicsFlickable @@ -1278,6 +1278,6 @@ void QmlGraphicsFlickablePrivate::updateVelocity() QT_END_NAMESPACE QML_DECLARE_TYPE(QmlGraphicsFlickableVisibleArea) -QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,VisibleArea,QmlGraphicsFlickableVisibleArea) +QML_DEFINE_TYPE(Qt,4,6,VisibleArea,QmlGraphicsFlickableVisibleArea) #include "qmlgraphicsflickable.moc" |