Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.7
authorAlexis Menard <alexis.menard@nokia.com>
Thu, 25 Mar 2010 06:00:55 +0000 (07:00 +0100)
committerAlexis Menard <alexis.menard@nokia.com>
Thu, 25 Mar 2010 06:00:55 +0000 (07:00 +0100)
commit32b5fdfabf3158c7b03d1011f4551a45371b27e3
tree0339732e5529917a52eb7ff86e6209c262ab7032
parentd373f8b8ee0a5841bcdb264b0b01b262c15e7f89
parenta4f0b174dd7d6eb837915d9d99b2067b8cb00187
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.7

Conflicts:
mkspecs/common/symbian/symbian.conf
qmake/generators/symbian/symmake.cpp
src/3rdparty/webkit/WebCore/WebCore.pro
26 files changed:
doc/src/development/qmake-manual.qdoc
mkspecs/common/symbian/symbian.conf
mkspecs/features/symbian/qt.prf
src/3rdparty/webkit/WebCore/WebCore.pro
src/corelib/corelib.pro
src/corelib/io/qfsfileengine_p.h
src/corelib/io/qfsfileengine_unix.cpp
src/gui/dialogs/qdialog.cpp
src/gui/graphicsview/qgraphicsitem.cpp
src/gui/graphicsview/qgraphicsitem.h
src/gui/graphicsview/qgraphicsitem_p.h
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/qpixmapdata_vg.cpp
src/s60installs/s60installs.pro
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp