Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 12 May 2011 15:11:57 +0000 (01:11 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 12 May 2011 15:11:57 +0000 (01:11 +1000)
commitd4a649e8b0b9d8dc35516b8884b490c344a01c54
tree6fda2ad1b67462d31df478b4be64ddbf8d24df82
parent46ecdac5c9ffb33c22d57f9249fe133aca871a3d
parent4214ddc1d9c9662ab646f2ab4ba0bccb0ead6b64
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Fix compilation with namespaces enabled