Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
authorOlivier Goffart <olivier.goffart@nokia.com>
Tue, 24 May 2011 09:07:15 +0000 (11:07 +0200)
committerOlivier Goffart <olivier.goffart@nokia.com>
Tue, 24 May 2011 09:21:26 +0000 (11:21 +0200)
commit886af794d72947d924fbecc1ca29d541207f3282
tree65a92e66a9a8d684fcab448b9575af800b5678e0
parent534f5098c577f262b4b01d1c21cd0ec1af0f25f1
parent9f9ac102bd7b492c6801841eee607130bff51d64
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7

Conflicts:
src/gui/text/qfontengine_ft.cpp
src/gui/text/qtextlayout.cpp
src/plugins/phonon/mmf/mmf.pro
src/plugins/s60/5_0/5_0.pro
src/s60installs/bwins/QtCoreu.def
src/s60installs/bwins/QtDeclarativeu.def
src/s60installs/bwins/QtGuiu.def
src/s60installs/bwins/QtMultimediau.def
src/s60installs/bwins/QtNetworku.def
src/s60installs/bwins/QtScriptu.def
src/s60installs/bwins/QtSqlu.def
src/s60installs/bwins/QtTestu.def
src/s60installs/bwins/QtXmlPatternsu.def
src/s60installs/bwins/QtXmlu.def
src/s60installs/bwins/phononu.def
src/s60installs/s60installs.pro
tests/auto/qcssparser/qcssparser.pro
tests/auto/qtextlayout/tst_qtextlayout.cpp

Changes in qtextlayout.cpp and tst_qtextlayout.cpp and
qfontengine_ft.cpp are not merged because they will have
other fixes in 4.8
13 files changed:
mkspecs/features/symbian/application_icon.prf
src/declarative/graphicsitems/qdeclarativetextinput.cpp
src/gui/dialogs/dialogs.pri
src/gui/styles/styles.pri
src/plugins/phonon/mmf/mmf.pro
src/s60installs/bwins/QtCoreu.def
src/s60installs/bwins/QtDeclarativeu.def
src/s60installs/bwins/QtGuiu.def
src/s60installs/bwins/QtNetworku.def
src/s60installs/bwins/QtOpenGLu.def
src/s60installs/s60installs.pro
tests/auto/qcssparser/qcssparser.pro
tests/auto/qtextlayout/tst_qtextlayout.cpp