diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-10-12 06:56:50 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-10-12 06:56:50 (GMT) |
| commit | 7421702dd3202c21f3871171792476f0d2d50abe (patch) | |
| tree | 5a45e20fd74e23cf0a4ad2aa1a80bd073fa51413 /src/declarative/fx/qfxgridview.cpp | |
| parent | 9094a6588de3a7264ec4647a24b94253a7609823 (diff) | |
| parent | 949e21cdafeec0c0e4ac632ebbf21767479f04e5 (diff) | |
| download | Qt-7421702dd3202c21f3871171792476f0d2d50abe.zip Qt-7421702dd3202c21f3871171792476f0d2d50abe.tar.gz Qt-7421702dd3202c21f3871171792476f0d2d50abe.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/qml/qmlcompiler.cpp
Diffstat (limited to 'src/declarative/fx/qfxgridview.cpp')
| -rw-r--r-- | src/declarative/fx/qfxgridview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/fx/qfxgridview.cpp b/src/declarative/fx/qfxgridview.cpp index 2d25d56..6abe88e 100644 --- a/src/declarative/fx/qfxgridview.cpp +++ b/src/declarative/fx/qfxgridview.cpp @@ -991,7 +991,7 @@ void QFxGridView::setCellWidth(int cellWidth) if (cellWidth != d->cellWidth && cellWidth > 0) { d->cellWidth = qMax(1, cellWidth); d->updateGrid(); - emit cellSizeChanged(); + emit cellWidthChanged(); d->layout(); } } @@ -1008,7 +1008,7 @@ void QFxGridView::setCellHeight(int cellHeight) if (cellHeight != d->cellHeight && cellHeight > 0) { d->cellHeight = qMax(1, cellHeight); d->updateGrid(); - emit cellSizeChanged(); + emit cellHeightChanged(); d->layout(); } } |