diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-09-07 00:08:16 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-09-07 00:08:16 (GMT) |
| commit | d86df44da9c0771a7f6aa3dc7ea0dff95c3dd73c (patch) | |
| tree | 32e4da63e4da4ccaef3044d23ed73269ecac0cb1 | |
| parent | 262c7d1fdc5dfbd8c2e9f84d1d3055735b5bc4b3 (diff) | |
| parent | 354361bf6cd3ee9ae1600dc908d4483173fa691b (diff) | |
| download | Qt-d86df44da9c0771a7f6aa3dc7ea0dff95c3dd73c.zip Qt-d86df44da9c0771a7f6aa3dc7ea0dff95c3dd73c.tar.gz Qt-d86df44da9c0771a7f6aa3dc7ea0dff95c3dd73c.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| -rw-r--r-- | configure.exe | bin | 1363968 -> 1409024 bytes | |||
| -rw-r--r-- | src/declarative/fx/qfxgridview.cpp | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/configure.exe b/configure.exe Binary files differindex e91c1de..d52b0c1 100644 --- a/configure.exe +++ b/configure.exe diff --git a/src/declarative/fx/qfxgridview.cpp b/src/declarative/fx/qfxgridview.cpp index 13d274a..cccd7a6 100644 --- a/src/declarative/fx/qfxgridview.cpp +++ b/src/declarative/fx/qfxgridview.cpp @@ -59,7 +59,7 @@ public: attachedProperties.remove(parent()); } - Q_PROPERTY(QFxGridView *view READ view) + Q_PROPERTY(QFxGridView *view READ view CONSTANT) QFxGridView *view() { return m_view; } Q_PROPERTY(bool isCurrentItem READ isCurrentItem NOTIFY currentItemChanged) |