Merge branch 4.7 into qt-master-from-4.7
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 22 Mar 2011 16:05:56 +0000 (02:05 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 22 Mar 2011 16:05:56 +0000 (02:05 +1000)
commit30499d8e897472e42d97efd5014a2cc1f56cc725
tree27459cb72b251a4727c1d0fbd50406fb43c71f6c
parent13d4be08d1d07434515855e7fde8c3ab589358c4
parentbf95c0ed87bf8a2ccd0a3d57ed81b8ae8fb8c4f2
Merge branch 4.7 into qt-master-from-4.7
src/gui/styles/qs60style.cpp