summaryrefslogtreecommitdiffstats
path: root/src/declarative/fx/qfxgridview.h
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-10-09 04:29:10 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-10-09 04:29:10 (GMT)
commit9b7d77460c38ec93d98fa4779826b32bea2eaaff (patch)
treedf741aad025f325e0f15330887bcd82b0226b366 /src/declarative/fx/qfxgridview.h
parent04511e3dbbcdf40489852babbf4753e0f744c26f (diff)
parent3a0cb6ebef245780782fcab6709e471d26789590 (diff)
downloadQt-9b7d77460c38ec93d98fa4779826b32bea2eaaff.zip
Qt-9b7d77460c38ec93d98fa4779826b32bea2eaaff.tar.gz
Qt-9b7d77460c38ec93d98fa4779826b32bea2eaaff.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/fx/qfxgridview.h')
-rw-r--r--src/declarative/fx/qfxgridview.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/declarative/fx/qfxgridview.h b/src/declarative/fx/qfxgridview.h
index 08a7565..7f30f03 100644
--- a/src/declarative/fx/qfxgridview.h
+++ b/src/declarative/fx/qfxgridview.h
@@ -67,8 +67,8 @@ class Q_DECLARATIVE_EXPORT QFxGridView : public QFxFlickable
Q_PROPERTY(Flow flow READ flow WRITE setFlow)
Q_PROPERTY(bool keyNavigationWraps READ isWrapEnabled WRITE setWrapEnabled)
Q_PROPERTY(int cacheBuffer READ cacheBuffer WRITE setCacheBuffer)
- Q_PROPERTY(int cellWidth READ cellWidth WRITE setCellWidth NOTIFY cellSizeChanged)
- Q_PROPERTY(int cellHeight READ cellHeight WRITE setCellHeight NOTIFY cellSizeChanged)
+ Q_PROPERTY(int cellWidth READ cellWidth WRITE setCellWidth NOTIFY cellWidthChanged)
+ Q_PROPERTY(int cellHeight READ cellHeight WRITE setCellHeight NOTIFY cellHeightChanged)
Q_CLASSINFO("DefaultProperty", "data")
public:
@@ -121,7 +121,8 @@ public Q_SLOTS:
Q_SIGNALS:
void countChanged();
void currentIndexChanged();
- void cellSizeChanged();
+ void cellWidthChanged();
+ void cellHeightChanged();
protected:
virtual void viewportMoved();