diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-21 13:48:39 (GMT) | 
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-21 13:48:39 (GMT) | 
| commit | 02c83c2adf0513041d9a3866d4e589ad79d61bda (patch) | |
| tree | c4f55089c85b6cc10cd39c734b34a7b78b544cd6 /doc/src/snippets/sqldatabase/sqldatabase.pro | |
| parent | 2fdac06f820f2362d3ca83ab6d73ed874d903098 (diff) | |
| parent | b5af8fbbdc26fa50f40dad2c159b6b64827fa431 (diff) | |
| download | Qt-02c83c2adf0513041d9a3866d4e589ad79d61bda.zip Qt-02c83c2adf0513041d9a3866d4e589ad79d61bda.tar.gz Qt-02c83c2adf0513041d9a3866d4e589ad79d61bda.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:
  Avoid printing a warning
  Only steal hover events when enabled, in QtDemo's qml integration
  Allow things that load SameGame to disable the Quit button
  Seems to fix the keyboard focus confusion
  Fix test
  ListView doc improvements and examples clean up
  Doc fixes
  Fix event forwarding in QDeclarativeFlickable.
  doc: improve Repeater model docs.
  doc: couple more performance tips.
  BorderImage is not updated when border values change
  XmlListModel: Don't lock while doing the slow bit.
  Auto test for QTBUG-11507
  Properly update childrenRect for position changes and shrinking.
Diffstat (limited to 'doc/src/snippets/sqldatabase/sqldatabase.pro')
0 files changed, 0 insertions, 0 deletions
