summaryrefslogtreecommitdiffstats
path: root/examples/declarative/extending/coercion
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-05-14 19:48:29 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-05-14 19:48:29 (GMT)
commit42b528b20b5eba313cf76ad6b2f41cfe1a876781 (patch)
tree3b36b45d4df96ba73013da5c3ba3e41810836617 /examples/declarative/extending/coercion
parent01e03e91a0c6867205f5a3ab0306f0c6a067ffad (diff)
parentc8d2e18c4b431870560f324a17f20904bb47ae68 (diff)
downloadQt-42b528b20b5eba313cf76ad6b2f41cfe1a876781.zip
Qt-42b528b20b5eba313cf76ad6b2f41cfe1a876781.tar.gz
Qt-42b528b20b5eba313cf76ad6b2f41cfe1a876781.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: More improvements to pixmap cache key generation More 4.7 stuff. Fix for autotest failure in qwidget::saveRestoreGeometry() Optimized pixmapcache key generation for icons and styles doc: Another upgrade of the top page and overviews. Mac: restoreGeometry() [Regression] Build failure on Mac Carbon doc: Added some \briefs to how-to docs. Some 4.7 changes. Updated changelog. Cherry pick fix for MOBILITY-932 from Qt Mobility. Cherry pick fix for MOBILITY-962 from Qt Mobility. Cherry pick fix for MOBILITY-828 from Qt Mobility. Bearer management changes from Qt Mobility. Cherry pick fix for MOBILITY-828 from Qt Mobility. Added snippet labels to QML Dial example. Fixed documentation typo.
Diffstat (limited to 'examples/declarative/extending/coercion')
0 files changed, 0 insertions, 0 deletions