Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
authorThiago Macieira <thiago.macieira@nokia.com>
Wed, 21 Apr 2010 14:40:42 +0000 (16:40 +0200)
committerThiago Macieira <thiago.macieira@nokia.com>
Wed, 21 Apr 2010 14:40:42 +0000 (16:40 +0200)
commit7807d804c85b0978cd3e1e3325abbd16dabd2ae0
tree558c75b2b7f1f101a0e472b6ad6f808b3d2c06aa
parentc74dac2a0ef5d1b428c4da4e48fab05f9886233a
parentc24bff633684b99d05e28bd4926e557fb553cf75
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6

Conflicts:
src/openvg/qpaintengine_vg.cpp
src/script/bridge/qscriptqobject_p.h
tests/auto/bic/tst_bic.cpp
26 files changed:
doc/src/platforms/platform-notes.qdoc
src/gui/graphicsview/qgraphicsitem_p.h
src/gui/graphicsview/qgraphicsview_p.h
src/gui/kernel/qapplication_s60.cpp
src/gui/kernel/qsoftkeymanager_s60.cpp
src/gui/kernel/qt_cocoa_helpers_mac.mm
src/gui/painting/qprintengine_win.cpp
src/gui/styles/qs60style_s60.cpp
src/gui/widgets/qmenu.cpp
src/multimedia/audio/qaudioinput_win32_p.cpp
src/multimedia/audio/qaudiooutput_win32_p.cpp
src/network/access/qhttpnetworkconnectionchannel.cpp
src/network/access/qnetworkreplyimpl.cpp
src/network/kernel/qhostinfo.cpp
src/network/socket/qabstractsocket.cpp
src/openvg/qpaintengine_vg.cpp
src/script/bridge/qscriptqobject_p.h
src/sql/drivers/sqlite/qsql_sqlite.cpp
src/testlib/qtestlogger.cpp
tests/auto/bic/tst_bic.cpp
tests/auto/qscriptengine/tst_qscriptengine.cpp
tests/auto/qscriptvalue/tst_qscriptvalue.cpp
tests/auto/selftests/expected_cmptest.txt
tests/auto/selftests/expected_longstring.txt
tests/auto/selftests/expected_skip.txt
tests/auto/selftests/tst_selftests.cpp