Merge remote-tracking branch 'qt/4.8'
authorSami Lempinen <sami.lempinen@nokia.com>
Wed, 31 Aug 2011 06:42:09 +0000 (09:42 +0300)
committerSami Lempinen <sami.lempinen@nokia.com>
Wed, 31 Aug 2011 06:42:09 +0000 (09:42 +0300)
commit10be762a98bf5d5947128e334405d532a42b3be0
tree2359dbf112a07a005f913aa46765bbf52b8bff95
parentc95b2b1fe0e5d02145e3cbdba1d88c7bb58a873f
parent1e48d40597bbe12321a5a3e42b3595dc17a7f8e7
Merge remote-tracking branch 'qt/4.8'
qmake/generators/makefile.cpp
src/gui/kernel/qapplication_s60.cpp
src/gui/kernel/qt_s60_p.h