Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 5 Apr 2011 13:33:40 +0000 (23:33 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 5 Apr 2011 13:33:40 +0000 (23:33 +1000)
commit9bf0037c09fb08f84d2a70a072b1356e8a41c25e
tree253cacf85c2b1abd0a3027906c70e0c2c130d874
parent7f272cc96f0ece5fe55ccba1ac4b9ae4c5dbecf6
parent2e0b5644e17f22ef3fc24ce4c762449149b24af6
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging:
  Mac: p2 combobox regression fix
src/gui/widgets/qcombobox.cpp