Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integrationmaster
commitac6bd40b501c63941a4dfc4c1ba500b0c14f74de
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 29 Jan 2010 11:51:45 +0000 (29 12:51 +0100)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 29 Jan 2010 11:51:45 +0000 (29 12:51 +0100)
treecf5d9f100f640385d13948912eabc89d889e6fc8
parent2e5b5801a86c712f6873cfb423e1a95892b87047
parentebf9c943b789bb4ce1e1222ed17cc37bd0b1f1fe
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Carbon: crash problem in QWidgetPrivate::hide_sys, v2
  Carbon: crash problem in QWidgetPrivate::hide_sys