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)
commitf60b3e90e6fd28a543300365b7ad349215a6f849
tree684cae002507ba6fe58cba058c2da7b888cd2511
parent348f5f40d897f2d2e36af2e657467509394e515d
parent611837baec6a32f8c4d88c34f5b96cce15bf3120
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Don't crash if windowmanager is not initialized
  Compile fix for 64bit Linux.