Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 19 May 2011 14:58:20 +0000 (00:58 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 19 May 2011 14:58:20 +0000 (00:58 +1000)
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Don't crash if windowmanager is not initialized
  Compile fix for 64bit Linux.


Trivial merge