Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
authorThiago Macieira <thiago.macieira@nokia.com>
Thu, 15 Jul 2010 13:08:38 +0000 (15:08 +0200)
committerThiago Macieira <thiago.macieira@nokia.com>
Thu, 15 Jul 2010 13:08:38 +0000 (15:08 +0200)
commit8cda4ebd5611a6680cd311ff7cadfcc43c6f1686
tree9f1813234d33b577951e21eee7d81f65c1f20769
parent03c01176ebf423085e56ceabcf8335ca5027a786
parent77edce14629b665924e89b1f22f902ceb010c964
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6

Conflicts:
bin/syncqt
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebCore/bridge/qt/qt_instance.cpp
src/3rdparty/webkit/WebCore/bridge/qt/qt_runtime.h
src/3rdparty/webkit/WebCore/page/FrameView.cpp
src/3rdparty/webkit/WebCore/page/FrameView.h
src/3rdparty/webkit/WebCore/platform/ScrollView.cpp
src/3rdparty/webkit/WebCore/platform/ScrollView.h
src/corelib/plugin/quuid.cpp
src/gui/dialogs/qfontdialog.cpp
src/multimedia/audio/qaudiodevicefactory.cpp
src/opengl/qgl.cpp
src/openvg/qpaintengine_vg.cpp
tests/auto/qxmlquery/tst_qxmlquery.cpp
24 files changed:
bin/syncqt
examples/qtconcurrent/progressdialog/main.cpp
src/corelib/global/qglobal.cpp
src/corelib/io/qfsfileengine_unix.cpp
src/corelib/plugin/quuid.cpp
src/corelib/tools/qsharedpointer_impl.h
src/gui/dialogs/qfontdialog.cpp
src/gui/graphicsview/qgraphicsitem.cpp
src/gui/graphicsview/qgraphicsitem_p.h
src/gui/inputmethod/qcoefepinputcontext_s60.cpp
src/gui/widgets/qlineedit.cpp
src/multimedia/audio/qaudiodevicefactory.cpp
src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
src/multimedia/audio/qaudioinput_alsa_p.h
src/multimedia/audio/qaudioinput_win32_p.cpp
src/multimedia/audio/qaudiooutput_win32_p.cpp
src/network/ssl/qsslsocket_openssl.cpp
src/opengl/qgl.cpp
src/openvg/qpaintengine_vg.cpp
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
tests/auto/qsharedpointer/tst_qsharedpointer.cpp
tests/auto/qxmlquery/qxmlquery.pro
tests/auto/qxmlquery/tst_qxmlquery.cpp