diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-22 22:39:29 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-22 22:39:29 (GMT) |
commit | c042ad25ef1cf65c163bcdd3504e8482446cbf7b (patch) | |
tree | f493da0591281db183c23c86ecc3dc078009cafa /doc/src/snippets/sqldatabase/sqldatabase.cpp | |
parent | 5d3b132dd94f6c985fa3f9584dedb46823acddfe (diff) | |
parent | 27d59016d35ae84d89e8d09bdadb1c3a89ac3f22 (diff) | |
download | Qt-c042ad25ef1cf65c163bcdd3504e8482446cbf7b.zip Qt-c042ad25ef1cf65c163bcdd3504e8482446cbf7b.tar.gz Qt-c042ad25ef1cf65c163bcdd3504e8482446cbf7b.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:
Handle TextInput inputMethodEvent() properly
Remove transparent.qml example for now, until QTBUG-11591 is fixed
qmldir no longer necessary
Add demo thumbnails to Examples/Demos index to make it more interesting
Doc
Allow QT_TR_NOOP (as a no-op) in ListModel values.
Diffstat (limited to 'doc/src/snippets/sqldatabase/sqldatabase.cpp')
0 files changed, 0 insertions, 0 deletions