Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 28 May 2010 14:45:00 +0000 (16:45 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 28 May 2010 14:45:00 +0000 (16:45 +0200)
commit035129c96d714ba6183057ff2b77658d993394db
tree317249b0df389d4d13616be8903e1d96330a1565
parent25a789c836fd856c0bcda4aeaa51c6e5a99924f5
parent9228b527f2fa95aad7f34cbc44905fb8b371bbf7
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  test QMultiMap::operator+= and QMultiHash::operator+=
  QMultiMap/QMultiHash:  must qualify identifier to find this declaration in dependent base class