summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-09-04 06:10:55 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-09-04 06:10:55 (GMT)
commit354361bf6cd3ee9ae1600dc908d4483173fa691b (patch)
tree87d2f8a5516bbd867abe71f290968fd121323348
parentabd57a0649bcb00b8855ef3c2539e93be6f73ce3 (diff)
parentc1cdc2f84d3c0a0415d93f984acf48297f127c6f (diff)
downloadQt-354361bf6cd3ee9ae1600dc908d4483173fa691b.zip
Qt-354361bf6cd3ee9ae1600dc908d4483173fa691b.tar.gz
Qt-354361bf6cd3ee9ae1600dc908d4483173fa691b.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
-rw-r--r--src/declarative/fx/qfxgridview.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/fx/qfxgridview.cpp b/src/declarative/fx/qfxgridview.cpp
index 6fd080b..7279e2c 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)