Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
authorThiago Macieira <thiago.macieira@nokia.com>
Mon, 29 Mar 2010 08:45:22 +0000 (10:45 +0200)
committerThiago Macieira <thiago.macieira@nokia.com>
Mon, 29 Mar 2010 08:45:22 +0000 (10:45 +0200)
commitde306893b464ed0fa00f98488912fd6269713519
treeb1ef87ee3e5afa0722c9da87a45e11ff3f620fdc
parent4fb6cae4dd0c6a90008780df606abb8a9e73cb2c
parent473da75ed84651c70ae0d10e23f09e1a0e4ae799
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6

Conflicts:
mkspecs/common/symbian/symbian.conf
qmake/generators/symbian/symmake.cpp
src/3rdparty/webkit/WebCore/WebCore.pro
35 files changed:
doc/src/development/qmake-manual.qdoc
doc/src/frameworks-technologies/activeqt.qdoc
mkspecs/common/symbian/symbian.conf
mkspecs/features/symbian/qt.prf
qmake/generators/symbian/symbiancommon.cpp
qmake/generators/symbian/symmake.cpp
src/3rdparty/webkit/WebCore/WebCore.pro
src/corelib/corelib.pro
src/corelib/io/qfsfileengine_p.h
src/corelib/io/qfsfileengine_unix.cpp
src/corelib/tools/qchar.cpp
src/gui/dialogs/qdialog.cpp
src/gui/dialogs/qmessagebox.cpp
src/gui/graphicsview/qgraphicsitem.cpp
src/gui/graphicsview/qgraphicsitem.h
src/gui/graphicsview/qgraphicsitem_p.h
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/graphicsview/qgraphicswidget.cpp
src/gui/graphicsview/qgraphicswidget_p.h
src/gui/gui.pro
src/gui/kernel/qapplication_s60.cpp
src/gui/styles/qs60style_s60.cpp
src/gui/text/qfontengine.cpp
src/gui/text/qfontengine_win.cpp
src/gui/text/qfontmetrics.cpp
src/gui/text/qtextlayout.cpp
src/gui/widgets/qmenu.cpp
src/network/kernel/qhostinfo.cpp
src/openvg/qpaintengine_vg.cpp
src/openvg/qpixmapdata_vg.cpp
src/s60installs/s60installs.pro
src/sql/drivers/odbc/qsql_odbc.cpp
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
tests/auto/qnetworkreply/tst_qnetworkreply.cpp