Merge remote branch 'origin/4.8' into 4.8-from-4.7
authorRohan McGovern <rohan.mcgovern@nokia.com>
Tue, 17 May 2011 23:05:24 +0000 (09:05 +1000)
committerRohan McGovern <rohan.mcgovern@nokia.com>
Tue, 17 May 2011 23:05:24 +0000 (09:05 +1000)
commit08a5b8d504e86a80488a2a13525e700b6f8b3311
tree3e6b31daecfe217b355fa973f2f122da8468c0ac
parent3773fcb78db02a2577c89f755c07c2c7dbf0de74
parentcb2980a09aefcc207eacb500d5a3c74f064859dd
Merge remote branch 'origin/4.8' into 4.8-from-4.7
qmake/generators/makefile.cpp
src/gui/kernel/qwidget.cpp
src/gui/text/qfontengine_ft.cpp
src/gui/text/qtextobject.cpp
src/gui/text/qtextobject.h
src/gui/widgets/qlinecontrol.cpp
tests/auto/qpixmap/tst_qpixmap.cpp
tests/auto/qwidget/tst_qwidget.cpp