Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
authorLiang Qi <liang.qi@nokia.com>
Wed, 20 Jul 2011 11:01:24 +0000 (13:01 +0200)
committerLiang Qi <liang.qi@nokia.com>
Wed, 20 Jul 2011 11:01:24 +0000 (13:01 +0200)
commitb7b20e33f36fd942811af33eae906ccdcf486112
treeb79f93c0cb2ef72056a378aec0d28a770ae07b8a
parente35c073c72bb297b4760ee4041ce487c08723d14
parentb8205bd9dc0288f66f1c23e9f227e703bc6712bd
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7

Conflicts:
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/declarative/graphicsitems/qdeclarativetextinput.cpp
src/gui/widgets/qlinecontrol.cpp
src/gui/widgets/qlinecontrol_p.h
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
tests/auto/qlineedit/tst_qlineedit.cpp