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 05:46:15 +0000 (06:46 +0100)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 17 Feb 2010 05:46:15 +0000 (06:46 +0100)
commitb4b2970a75655ef28b3564c031768c767d6fd071
tree4643e88408ade9a60d37dfc0ba008bab80251194
parent10b4dee4b0e196646e0bb4aab37dae6eaca8326e
parent48f4fe4897ba6b98434993179b47d6d9491ae173
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:
  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