diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-07 22:32:07 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-07 22:32:07 +1000 |
| commit | bb3c309cf99e043b4de43feaa8c2a801f7853d22 (patch) | |
| tree | 609163646671a793c2f422501f70d9805dab27df /doc/src/snippets/code/doc_src_examples_imageviewer.cpp | |
| parent | ef5eabdd58a9f584cff8b4e70b7eea583957114c (diff) | |
| parent | 7d857bee73c9e81da203543a132b5b836853b797 (diff) | |
| download | qt4-tools-bb3c309cf99e043b4de43feaa8c2a801f7853d22.tar.gz | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QSslCertificate: block all DigiNotar (intermediate and root) certs
QSslCertificate: also check common name for blacklisted certificates
Fix typo in header guard.
fix doc typo
Ensure that the corewlan plugin can be built with the Mac OS X 10.7 sdk
remove obsolete define
Diffstat (limited to 'doc/src/snippets/code/doc_src_examples_imageviewer.cpp')
0 files changed, 0 insertions, 0 deletions