Merge branch 4.7 into qt-4.8-from-4.7
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 2 Sep 2011 16:08:26 +0000 (02:08 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 2 Sep 2011 16:08:26 +0000 (02:08 +1000)
commit398badb76a1690309f4da2b8d18821308bc2788f
treeb2043fdeb5b06e24a4d088f5f2956e6e091f3951
parent47ec2fd2193f56e02a402df4d0fa9f1b521d07fc
parent00ffa83f2dbe3b3019dc564d6b4447f83b5d655f
Merge branch 4.7 into qt-4.8-from-4.7
src/declarative/graphicsitems/qdeclarativeborderimage.cpp
src/gui/util/qdesktopservices_s60.cpp