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)
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Add qglobal.h exports for QtLocation & QtSensors


Trivial merge