diff options
| author | Kai Koehne <kai.koehne@nokia.com> | 2011-05-10 15:14:16 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@nokia.com> | 2011-05-10 15:14:16 +0200 |
| commit | baecfbc7f7e0ec7edddb74a2e760c685977e9084 (patch) | |
| tree | f9071063e3b8dfcc1b2fcb3236be84fce5b17091 /doc/src/snippets/code/src_sql_kernel_qsqlquery.cpp | |
| parent | bde58ad1e7d2b38d2882aaf869e93b0415128836 (diff) | |
| parent | f3ddd2d995b7485cdc1c3420d254499904ff9dd9 (diff) | |
| download | qt4-tools-baecfbc7f7e0ec7edddb74a2e760c685977e9084.tar.gz | |
Merge remote branch 'qt/4.8' into master-qml-staging
Conflicts:
src/declarative/debugger/qdeclarativedebugserver.cpp
src/plugins/qmltooling/qmltooling.pro
Diffstat (limited to 'doc/src/snippets/code/src_sql_kernel_qsqlquery.cpp')
0 files changed, 0 insertions, 0 deletions