Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into maste...

Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
  StrictlyEnforceRange with snapOneItem/Row and header behavior change
  Release font engine refcount when done using it in QTextEngine
  Migrate addMarkUp function to QChar.
  update the proxy info before session is opened in QNAM by Aapo Makela
  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
  Fix assert error on Windows with a negative char.
  Doc: Fixed the example of an encoded URL in the class description.
  Added an additional check to workaround an issue on Windows.