Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
authorThiago Macieira <thiago.macieira@nokia.com>
Tue, 30 Mar 2010 13:38:25 +0000 (15:38 +0200)
committerThiago Macieira <thiago.macieira@nokia.com>
Tue, 30 Mar 2010 13:38:25 +0000 (15:38 +0200)
commit7c613a9ef4610fa2e0e1630eb3cd2b474875631d
tree757be578070f7cb7c724476e7b6980ee5ad215a4
parent39f88fc60ad6ce323000a10b2925ad7dbb1544c2
parentc45ce66ce417718e09de276bfdb663aa5e9fe366
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6

Conflicts:
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
src/3rdparty/webkit/WebCore/plugins/symbian/PluginViewSymbian.cpp
src/gui/kernel/qwidget_p.h
src/gui/styles/qgtkstyle.cpp
src/gui/text/qfontdatabase_s60.cpp
src/gui/text/qfontengine_win.cpp
src/opengl/qgl_p.h