Merge branch '4.6-s60' into 4.7-s60
authoraxis <qt-info@nokia.com>
Thu, 24 Jun 2010 11:14:21 +0000 (13:14 +0200)
committeraxis <qt-info@nokia.com>
Thu, 24 Jun 2010 11:14:21 +0000 (13:14 +0200)
commit447f2b410335730cd172a76abce184bacae186d2
tree73d93ef871e99f03eedd69eeb0fa74228c1e33d3
parent5ce3b09f9b3c574fc4ab2ecc42f879e64df0e6a1
parent7ae5285132db6c435e91ab097f41097217d68a2c
Merge branch '4.6-s60' into 4.7-s60

Conflicts:
src/3rdparty/phonon/qt7/mediaobject.mm
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/plugins/phonon/mmf/mmf.pro
demos/spectrum/app/app.pro
demos/spectrum/spectrum.pro
src/corelib/kernel/qeventdispatcher_symbian.cpp
src/corelib/kernel/qeventdispatcher_symbian_p.h
src/gui/kernel/qwidget_s60.cpp
src/network/kernel/qhostinfo_unix.cpp
src/opengl/qgl_p.h
src/plugins/phonon/mmf/mmf.pro