Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
authorOlivier Goffart <olivier.goffart@nokia.com>
Tue, 8 Jun 2010 10:02:23 +0000 (12:02 +0200)
committerOlivier Goffart <olivier.goffart@nokia.com>
Tue, 8 Jun 2010 10:02:23 +0000 (12:02 +0200)
commit03dc74984749adf5b11482bf871a47086217845c
tree58eaa299c0d87d6d678fe635fddaab42177328cf
parentdfd7c876263310c03d8b64033749efe2b6b1e081
parent0cd433404210fdaa6b21a98ef5768c9b761ed024
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6

Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
src/3rdparty/webkit/WebKit/qt/ChangeLog
src/gui/painting/qpainter.cpp
src/gui/painting/qtextureglyphcache.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/eabi/QtGuiu.def
src/s60installs/eabi/QtNetworku.def
src/s60installs/eabi/QtOpenVGu.def
tests/auto/qfontmetrics/tst_qfontmetrics.cpp
tools/linguist/lupdate/main.cpp
26 files changed:
configure
mkspecs/linux-g++-maemo/qmake.conf
qmake/generators/mac/pbuilder_pbx.cpp
qmake/generators/win32/msvc_objectmodel.cpp
src/corelib/kernel/qeventdispatcher_symbian.cpp
src/corelib/tools/qhash.h
src/corelib/tools/qmap.h
src/gui/embedded/qwsmanager_qws.cpp
src/gui/image/qimage.cpp
src/gui/kernel/qapplication_s60.cpp
src/gui/kernel/qapplication_win.cpp
src/gui/kernel/qapplication_x11.cpp
src/gui/kernel/qwidget.cpp
src/gui/kernel/qwidget_p.h
src/gui/painting/qbackingstore.cpp
src/gui/styles/qstylesheetstyle.cpp
src/gui/text/qtextlayout.cpp
src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
src/opengl/qgl_x11.cpp
src/openvg/qpaintengine_vg.cpp
src/qbase.pri
tests/auto/qfontmetrics/tst_qfontmetrics.cpp
tests/auto/qwidget/tst_qwidget.cpp
tools/linguist/lupdate/main.cpp
tools/linguist/lupdate/qscript.g