Merge branch 4.7 into qt-4.8-from-4.7
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 7 Jun 2011 16:08:38 +0000 (02:08 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 7 Jun 2011 16:08:38 +0000 (02:08 +1000)
commitc6a8f35846df86a87591372d022e54a701591f5b
tree471f5eb02ccee400c2587e8b3fae55b922d848d1
parentd4c00ffb6f01a991118388957de831394c8ad9c1
parent1dd89b6ad0546f247486b63f72035baf21475b51
Merge branch 4.7 into qt-4.8-from-4.7
demos/deform/main.cpp
demos/pathstroke/main.cpp
src/gui/inputmethod/qcoefepinputcontext_s60.cpp
src/gui/kernel/qapplication_s60.cpp