Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 17 Feb 2010 13:55:12 +0000 (14:55 +0100)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 17 Feb 2010 13:55:12 +0000 (14:55 +0100)
commit340b44156245a520e53119815670becd3eb7fb70
treeda53b100bc52132841e5d9c1f956f25cf183a441
parent17a0a50a101fc9863d0dffd0dcb887ba68a99622
parent095496e02610c66d34cf3ee0fc329abed2be47e3
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Change all ptrdiff_t to qptrdiff.
  HTTP backend: remove comment
  Fixed failure of maketestselftest with vcproj generator.
  Fixed compile of compilerwarnings test with vcproj generator.
  Fixed compile of qlibrary test with vcproj generator.
  Fixed compile of xmlpatterns tests with vcproj generator.
  Fixed compile of shm/sem tests with vcproj generator.
  Fixed compile of QtHelp tests with vcproj generator.
  Fixed tests using Q_DECLARE_* when Qt is configured with -qtnamespace
  Fixed compile of these tests when Qt is configured with -qtnamespace
  Check in sample license headers