Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7
authorOlivier Goffart <olivier.goffart@nokia.com>
Thu, 3 Mar 2011 15:34:32 +0000 (16:34 +0100)
committerOlivier Goffart <olivier.goffart@nokia.com>
Thu, 3 Mar 2011 15:34:32 +0000 (16:34 +0100)
commit8ddf96a15f707001755d5b934f3f900b825b5887
tree5dee68c5bd2e691218bd45c7b74da7c7c16b22cd
parent5414957f0feebe24a2aa0ac7c5ec32e53e49b57a
parentd7a00eaec6d94fd2383d6f815f792d26b7161f0c
Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7

Conflicts:
src/openvg/qvg_symbian.cpp
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
doc/src/development/qmake-manual.qdoc
qmake/generators/win32/winmakefile.cpp
src/gui/image/image.pri
src/gui/image/qpixmapdata_p.h
src/gui/painting/qgraphicssystem.cpp
src/gui/painting/qgraphicssystem_p.h
src/gui/widgets/qlinecontrol.cpp
tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
tests/auto/gui.pro