Merge branch '4.8-upstream' into master-water
authorWater-Team <water@pad.test.qt.nokia.com>
Wed, 29 Jun 2011 21:42:03 +0000 (23:42 +0200)
committerWater-Team <water@pad.test.qt.nokia.com>
Wed, 29 Jun 2011 21:42:03 +0000 (23:42 +0200)
commit0a8daa8845325fba9cf2ec973eb6bab8a2853dd5
tree504c698037ee6283f1b5dbc6fa658bb2bfffb99a
parent680023c4921019614948c277cde5498645836cb9
parent6b3f2a3b96d01dc339d07a076300d29616603b28
Merge branch '4.8-upstream' into master-water
src/gui/kernel/qwidget_mac.mm
tests/auto/qwidget/tst_qwidget.cpp