Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qa-staging into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 15 Nov 2011 09:23:02 +0000 (19:23 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 15 Nov 2011 09:23:02 +0000 (19:23 +1000)
commitf86ca84e783c34e701f3742902161cb365e6e940
tree17b263b4d9e4254fbe70dd82171457b1b503fbb3
parent1c256b23df43aec975da2c9e8629d102ad13bd93
parent9be94925138d11f9a2f191f9676665eb8f3e6d3a
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qa-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qa-staging:
  tests: allow unstable tests to be marked with CONFIG+=insignificant_test