Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
authorThiago Macieira <thiago.macieira@nokia.com>
Tue, 25 May 2010 08:23:01 +0000 (10:23 +0200)
committerThiago Macieira <thiago.macieira@nokia.com>
Tue, 25 May 2010 08:23:01 +0000 (10:23 +0200)
commit7c471bde498c07f03acc612d5f132b904bc3870e
tree136805e93f9b781c6900f5efaa0bd6ce2301b68d
parent55664a0ef4b88b67c9931c7d2f6853e5fa0a9716
parent6f6909ac6681ed614f00998a0d43b7b195dbb90b
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6

Conflicts:
demos/spectrum/app/app.pro
src/gui/egl/qegl.cpp
tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro
tests/auto/qmenu/tst_qmenu.cpp
14 files changed:
src/corelib/kernel/qeventdispatcher_symbian.cpp
src/corelib/kernel/qeventdispatcher_symbian_p.h
src/dbus/qdbusintegrator.cpp
src/dbus/qdbuspendingcall.cpp
src/dbus/qdbuspendingcall_p.h
src/dbus/qdbuspendingreply.cpp
src/gui/egl/qegl.cpp
src/gui/kernel/qapplication_p.h
src/gui/kernel/qapplication_s60.cpp
src/multimedia/audio/qaudiodeviceinfo.cpp
src/network/socket/qnativesocketengine_unix.cpp
tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro
tests/auto/qmenu/tst_qmenu.cpp
tests/auto/qsslkey/qsslkey.pro