diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-10 10:12:14 +1000 |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-10 10:12:14 +1000 |
commit | 5c0d1ab1236b895e84d254ac6670c802e9162952 (patch) | |
tree | 18532f03e7cae7fb88b00d8b9d4d7514c50ea0ab /doc/src/snippets/code/src_sql_kernel_qsqlquery.cpp | |
parent | 62c5bafeec64ef5a81a9011b4cf377b5d1d20653 (diff) | |
parent | ad35d25e78c8252a72108a4ba931934047c4707e (diff) | |
download | qt4-tools-5c0d1ab1236b895e84d254ac6670c802e9162952.tar.gz |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
Merge fixes for QDir::operator==
QSslCertificate: block all DigiNotar (intermediate and root) certs
Restore Qt4.7 behaviour of QFileInfo::absolute(File)Path
Fix compile error on MSVC2008
Fix comparison of absolute, unclean paths in QDir
Wrap calls to Sequence::push_back
Diffstat (limited to 'doc/src/snippets/code/src_sql_kernel_qsqlquery.cpp')
0 files changed, 0 insertions, 0 deletions