Merge branch 4.7 into qt-4.8-from-4.7
authorSergio Ahumada <sergio.ahumada@nokia.com>
Wed, 31 Aug 2011 07:38:52 +0000 (09:38 +0200)
committerSergio Ahumada <sergio.ahumada@nokia.com>
Wed, 31 Aug 2011 07:39:36 +0000 (09:39 +0200)
commit0e10b8dbb7d84694cbdeb57bf42df52b12d79f47
treee0968185c3afce109537977c9eb0df4cfd8f6cb7
parentac51ebee5bcc975829cf59012dfe9bb198016ed1
parent5a9000c3aca05e28c4fc537f82d85d6ec4395dc5
Merge branch 4.7 into qt-4.8-from-4.7

Conflicts:
doc/src/index.qdoc
25 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/text/qfontdatabase_s60.cpp
src/gui/widgets/qlinecontrol.cpp
src/gui/widgets/qtextedit.cpp
src/network/ssl/qsslcertificate.cpp
tests/auto/qlineedit/tst_qlineedit.cpp
tools/qdoc3/cppcodemarker.cpp