Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7
authorOlivier Goffart <olivier.goffart@nokia.com>
Mon, 16 May 2011 08:02:12 +0000 (10:02 +0200)
committerOlivier Goffart <olivier.goffart@nokia.com>
Mon, 16 May 2011 08:08:59 +0000 (10:08 +0200)
commit3773fcb78db02a2577c89f755c07c2c7dbf0de74
tree95115e9ccebc81ae8fdb6dfa9f8305ff9feff462
parent9f1bf75b1d55af2dda000cba580fafed2aa83838
parent7e4a9187bb11b794e45d95d2e9fae026d6b0d07d
Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7

Conflicts:
src/gui/kernel/qt_s60_p.h
configure
qmake/generators/makefile.cpp
src/gui/inputmethod/qcoefepinputcontext_s60.cpp
src/gui/kernel/qapplication_s60.cpp
src/gui/kernel/qsoftkeymanager_s60.cpp
src/gui/kernel/qt_s60_p.h
src/gui/kernel/qwidget_s60.cpp