Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
commit2e5b5801a86c712f6873cfb423e1a95892b87047
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 29 Jan 2010 07:52:22 +0000 (29 08:52 +0100)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 29 Jan 2010 07:52:22 +0000 (29 08:52 +0100)
treec91d33f86c3d2a20f40d0a71bf7def1e16ac623a
parent2f91e9ce0e02f613d68b5b59d00b61c8f4f12c68
parentc2e53adcb015e142436127f989b0f219df7ade36
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:
  Fix header labels on mac with rtl
  examples/dbus: update remotecontrolledcar example
  examples/dbus: update dbus-chat adaptor/interface files
  doc: Fix typo in QEvent::ignore() documentation
  doc: Fix qmake-manual warn_on/warn_off references