Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 4 Oct 2011 13:53:37 +0000 (23:53 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 4 Oct 2011 13:53:37 +0000 (23:53 +1000)
commitc7b6c35e2b32b5d85f90088906d7ca6ecfe47202
treee489b6c938c9509a10ceb785bcf480798a0cb14a
parent8b610c28c1300e0aa800569225d8512d0b66ffce
parent6a80266dae9e05de0a68d6a69f5f5416f9dd5746
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  add integrity gbuild to the project file for convenience
  don't build activeqt examples on mingw
  QNetworkAccessBackend::start() is used although QT_NO_BEARERMANAGEMENT is defined.
  Updated Russian translation
  Ukrainian translation updated for 4.8
  retreving -> retrieving
  Removed duplicate Spectrum Analyzer entry from demos doc page.
  Removed obsolete QWS_ALPHA_CURSOR feature.
  Removed duplicate link from QFinalState documentation.
  Clarified keypad navigation specific event documentation.
  docs: Typo and link fixes.
  Use the right callback in QObject::disconnect()