Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 16 May 2011 03:16:12 +0000 (13:16 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 16 May 2011 03:16:12 +0000 (13:16 +1000)
commit083867348f84971ff3911b298c1fc91a0a07217c
tree21d2a9f36e66ea5bad370897d9e1bad5d89a26dc
parentb5155fbb3a43e056c5267148dbf27f09d67be854
parent173099696f44073441975febfa35ddfb3585e8c5
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  tests: clean up usage of QT_CONFIG to fix circular dependencies