Merge branch 4.7 into qt-4.8-from-4.7
authorSergio Ahumada <sergio.ahumada@nokia.com>
Tue, 23 Aug 2011 20:45:26 +0000 (22:45 +0200)
committerSergio Ahumada <sergio.ahumada@nokia.com>
Tue, 23 Aug 2011 20:45:26 +0000 (22:45 +0200)
commitd54407928be05781ede2358baba2f2f91749cc80
tree0a7f387c9542f750236783eb39b9cd26c9693328
parent4e40c388aef3cb16a1492764c37ae8ba929e8aef
parent6c0c437962a2638cca162277b14a30dae4fed57b
Merge branch 4.7 into qt-4.8-from-4.7

Conflicts:
doc/src/index.qdoc
doc/src/index.qdoc
src/gui/image/qpixmap_mac.cpp
src/gui/inputmethod/qcoefepinputcontext_s60.cpp