Merge branch 4.7 into qt-4.8-from-4.7
authorSergio Ahumada <sergio.ahumada@nokia.com>
Thu, 1 Sep 2011 10:32:03 +0000 (12:32 +0200)
committerSergio Ahumada <sergio.ahumada@nokia.com>
Thu, 1 Sep 2011 10:32:03 +0000 (12:32 +0200)
commit274619e086e6e9ebba6c383ffb837dc140c840e7
treeb156bcf32c56a5e22a5c29d2af19bc37c5a8f797
parent9f51c31a0f492c20e6d882b2ae1e036b29c2755c
parentb7c57a2e26a325a1876bd7c68d9f187da084d569
Merge branch 4.7 into qt-4.8-from-4.7
src/gui/inputmethod/qcoefepinputcontext_s60.cpp
src/gui/kernel/qwidget.cpp
src/gui/kernel/qwidget.h
src/gui/kernel/qwidget_p.h
src/gui/kernel/qwidget_s60.cpp
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def