Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
authorThiago Macieira <thiago.macieira@nokia.com>
Wed, 11 Aug 2010 16:34:48 +0000 (18:34 +0200)
committerThiago Macieira <thiago.macieira@nokia.com>
Wed, 11 Aug 2010 16:34:48 +0000 (18:34 +0200)
commit319f4f07c80664d6e244daf22d9b4c13e5d4e69a
tree60c2b9b1462eab6eab6a15f541fe361c7a878eab
parentccb838e6d4e661c9280d5c69fa0b1717b85a1dd9
parent8dca92fd7987a9aa727dea6c367c079a39668f09
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6

Conflicts:
src/gui/kernel/qt_s60_p.h
src/opengl/qglextensions.cpp
src/opengl/qglshaderprogram.cpp
tests/auto/mediaobject/tst_mediaobject.cpp
src/corelib/global/qlibraryinfo.cpp
src/gui/inputmethod/qcoefepinputcontext_s60.cpp
src/opengl/qglextensions.cpp
src/opengl/qglshaderprogram.cpp
src/openvg/qpaintengine_vg.cpp