diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-15 11:42:01 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-15 11:42:01 (GMT) |
commit | 4327443d7e25a055b9ecafe5d20acd96f3dfbab8 (patch) | |
tree | ae9b4eacce2870e1983572a4998315552a7fabb4 /doc/src/snippets/sqldatabase/sqldatabase.cpp | |
parent | d3418466c75169a9a1d114c3d0f775288dbc40e7 (diff) | |
parent | c1e6d97b9476c859abc3927046144b4006fcf735 (diff) | |
download | Qt-4327443d7e25a055b9ecafe5d20acd96f3dfbab8.zip Qt-4327443d7e25a055b9ecafe5d20acd96f3dfbab8.tar.gz Qt-4327443d7e25a055b9ecafe5d20acd96f3dfbab8.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Remove duplicated code.
Fix bug with childrenRect resizing on startup.
Diffstat (limited to 'doc/src/snippets/sqldatabase/sqldatabase.cpp')
0 files changed, 0 insertions, 0 deletions