diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-05-16 23:09:00 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-05-16 23:09:00 (GMT) |
| commit | 8c216aee5d2e52b6fa36e256615374b9435bb4c9 (patch) | |
| tree | c65554b66874dae21a0876f804926254073aedd0 /src/declarative/graphicsitems | |
| parent | 3340b23699f0286876f1e237a66bdc85076fe191 (diff) | |
| parent | 3849cd0cca618fac88a54861a3ec30780711ce75 (diff) | |
| download | Qt-8c216aee5d2e52b6fa36e256615374b9435bb4c9.zip Qt-8c216aee5d2e52b6fa36e256615374b9435bb4c9.tar.gz Qt-8c216aee5d2e52b6fa36e256615374b9435bb4c9.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/graphicsitems')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativegridview_p.h | 2 | ||||
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativelistview_p.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativegridview_p.h b/src/declarative/graphicsitems/qdeclarativegridview_p.h index c06879e..f5d061d 100644 --- a/src/declarative/graphicsitems/qdeclarativegridview_p.h +++ b/src/declarative/graphicsitems/qdeclarativegridview_p.h @@ -142,7 +142,7 @@ public: void setSnapMode(SnapMode mode); enum PositionMode { Beginning, Center, End, Visible, Contain }; - Q_ENUMS(PositionMode); + Q_ENUMS(PositionMode) Q_INVOKABLE void positionViewAtIndex(int index, int mode); Q_INVOKABLE int indexAt(int x, int y) const; diff --git a/src/declarative/graphicsitems/qdeclarativelistview_p.h b/src/declarative/graphicsitems/qdeclarativelistview_p.h index 9c0b7dd..051455c 100644 --- a/src/declarative/graphicsitems/qdeclarativelistview_p.h +++ b/src/declarative/graphicsitems/qdeclarativelistview_p.h @@ -200,7 +200,7 @@ public: static QDeclarativeListViewAttached *qmlAttachedProperties(QObject *); enum PositionMode { Beginning, Center, End, Visible, Contain }; - Q_ENUMS(PositionMode); + Q_ENUMS(PositionMode) Q_INVOKABLE void positionViewAtIndex(int index, int mode); Q_INVOKABLE int indexAt(int x, int y) const; |