diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-09 15:05:23 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-09 15:05:23 (GMT) |
| commit | 460d52bfa85318610576d1ab75eae4799865e064 (patch) | |
| tree | c78dbf227b372e3d4d1d6dfd236f3b9ef9385576 /doc/src/snippets/code/src_script_qscriptable.cpp | |
| parent | 91577a693d1bc3a123ee1f4c6e73b8a49be03aef (diff) | |
| parent | 694ef883b3ab40806bfe3356278c639942c8c69d (diff) | |
| download | Qt-460d52bfa85318610576d1ab75eae4799865e064.zip Qt-460d52bfa85318610576d1ab75eae4799865e064.tar.gz Qt-460d52bfa85318610576d1ab75eae4799865e064.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Remove whitespace and leading tab from documentation change
Updating merge request 2512
QGraphicsLayoutItem - fix invalidating sizehint-with-constraints cache
Fix integer overflow in bitfield
Fix documentation for QML extended types
Removes the reseting of the QMenu offset.
Adding warning to QMenu documentation
Fix filtering of columns in QSFPM.
Diffstat (limited to 'doc/src/snippets/code/src_script_qscriptable.cpp')
0 files changed, 0 insertions, 0 deletions