Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 9 May 2011 05:43:57 +0000 (15:43 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 9 May 2011 05:43:57 +0000 (15:43 +1000)
commit3d8f39857fe66a20304012031638a51218ace009
treeea3932c8c428860c412cbccee5f9db4553bec9df
parentcf1440a6e390bb81484a1ff103c33b9ffae193c7
parent82444f5dff8257fede56b23ed898f9acd7cd2d61
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Add qglobal.h exports for QtLocation & QtSensors