Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
authorQt Continuous Integration System <qt-info@nokia.com>
Sat, 10 Sep 2011 00:12:14 +0000 (10:12 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Sat, 10 Sep 2011 00:12:14 +0000 (10:12 +1000)
commit5c0d1ab1236b895e84d254ac6670c802e9162952
tree18532f03e7cae7fb88b00d8b9d4d7514c50ea0ab
parent62c5bafeec64ef5a81a9011b4cf377b5d1d20653
parentad35d25e78c8252a72108a4ba931934047c4707e
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
src/corelib/io/qdir.cpp