Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: (26 commits)
Add a brief to all demos and examples for manifest
QSslCertificate: also check common name for blacklisted certificates
QSslCertificate: regenerate blacklisted certificates, they were expired
don't crash when destroying the shortcuts
Doc: added since tag to QDateTime::msecsTo
QSslCertificate: blacklist fraudulent *.google.com
QDeclarative::hasActiveFocus should return false for hidden items
FocusScope's focusItem must always be a descendent
Disable activeqt on win32-g++ (it doesn't build).
fix warning
remove unused functions
Make the DBus timeout configurable in QDBusAbstractInterface.
Fix a typo in qt-conf docs.
Revert "Fix build with the Clang compiler"
Added missing no_include_pwd check
Replace 'i < len-1 && func(i+1)' by 'i+1 < len && func(i+1)'
Fix build with the Clang compiler
Change spacing of title in offline style.
Add support for rawFonts loaded from data in FaceId
examples: fix compilation with namespaced Qt.
...