summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems/qdeclarativescalegrid_p_p.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-03-01 03:04:57 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-03-01 03:04:57 (GMT)
commit6174f91cc2a8a53c14d3b2f4eccc62f9170699c8 (patch)
tree08894dba6347764083f4fa9d73baed9486e2a986 /src/declarative/graphicsitems/qdeclarativescalegrid_p_p.h
parent1dca379031381eb7bff91970aec8056f1b7f2efb (diff)
parent47201b118179d6585d8eac8ab27f756010024a23 (diff)
downloadQt-6174f91cc2a8a53c14d3b2f4eccc62f9170699c8.zip
Qt-6174f91cc2a8a53c14d3b2f4eccc62f9170699c8.tar.gz
Qt-6174f91cc2a8a53c14d3b2f4eccc62f9170699c8.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml: Add mention of highlightRangeMode in snapMode docs. Fix position of image in detail view.
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativescalegrid_p_p.h')
0 files changed, 0 insertions, 0 deletions