diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-01 15:04:20 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-01 15:04:20 (GMT) |
| commit | 098436fabc56fb54b28038c9132c8d0961ec2b63 (patch) | |
| tree | 74bda1a9108b73cf46c560d2a59cb3928656ad6c /doc/src/snippets/sqldatabase/sqldatabase.pro | |
| parent | 8feb69b5b59aa697793c377cc79afd9e873e2d6d (diff) | |
| parent | b38c650407e4e89c4394129540aa0a0e81398763 (diff) | |
| download | Qt-098436fabc56fb54b28038c9132c8d0961ec2b63.zip Qt-098436fabc56fb54b28038c9132c8d0961ec2b63.tar.gz Qt-098436fabc56fb54b28038c9132c8d0961ec2b63.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Partially revert "Remove qWait functions as it is used in QTRY_* macros."
Remove qWait functions as it is used in QTRY_* macros.
Diffstat (limited to 'doc/src/snippets/sqldatabase/sqldatabase.pro')
0 files changed, 0 insertions, 0 deletions