Merge branch 4.7 into qt-4.8-from-4.7
authorSergio Ahumada <sergio.ahumada@nokia.com>
Fri, 26 Aug 2011 21:42:57 +0000 (23:42 +0200)
committerSergio Ahumada <sergio.ahumada@nokia.com>
Fri, 26 Aug 2011 21:42:57 +0000 (23:42 +0200)
commite028a54690f2fedfae6da19fb24b7401e4a71e56
tree72c038e84d9fb1063c970a121949d898442c5648
parentd54407928be05781ede2358baba2f2f91749cc80
parent6661f5c2222c145d854e225076195b37672637d2
Merge branch 4.7 into qt-4.8-from-4.7

Conflicts:
doc/src/index.qdoc
src/xmlpatterns/expr/qevaluationcache_p.h
28 files changed:
doc/src/declarative/declarativeui.qdoc
doc/src/index.qdoc
doc/src/qt4-intro.qdoc
src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp
src/declarative/graphicsitems/qdeclarativeborderimage.cpp
src/declarative/graphicsitems/qdeclarativeflickable.cpp
src/declarative/graphicsitems/qdeclarativegridview.cpp
src/declarative/graphicsitems/qdeclarativeitem.cpp
src/declarative/graphicsitems/qdeclarativelistview.cpp
src/declarative/graphicsitems/qdeclarativetext.cpp
src/declarative/graphicsitems/qdeclarativetextedit.cpp
src/declarative/graphicsitems/qdeclarativetextinput.cpp
src/declarative/graphicsitems/qdeclarativetextinput_p_p.h
src/gui/inputmethod/qcoefepinputcontext_s60.cpp
src/gui/kernel/qapplication_s60.cpp
src/gui/kernel/qkeysequence.cpp
src/gui/kernel/qsoftkeymanager.cpp
src/gui/kernel/qt_s60_p.h
src/gui/kernel/qwidget_s60.cpp
src/gui/styles/qs60style_s60.cpp
src/gui/text/qfontdatabase_s60.cpp
src/gui/text/qtextcontrol.cpp
src/gui/widgets/qcombobox.cpp
src/gui/widgets/qlinecontrol.cpp
src/gui/widgets/qtextedit.cpp
src/xmlpatterns/expr/qevaluationcache_p.h
tests/auto/qlineedit/tst_qlineedit.cpp
tools/qdoc3/cppcodemarker.cpp