Merge remote branch 'origin/4.6' into 4.7-from-4.6
authorRohan McGovern <rohan.mcgovern@nokia.com>
Wed, 19 May 2010 04:02:17 +0000 (14:02 +1000)
committerRohan McGovern <rohan.mcgovern@nokia.com>
Wed, 19 May 2010 04:02:17 +0000 (14:02 +1000)
commit2fb3ec5c80a0b9d211c0168fdcd1f4fb84c9b315
tree9eaf0842a9cd6f719e2d64866b806a84f57f8e1e
parent730bfd80804899771b39998c5b67e604d2192ecd
parentdcfe68f66e5162f9f7a05552aa1133cdc1f0f9c3
Merge remote branch 'origin/4.6' into 4.7-from-4.6
doc/doc.pri
qmake/generators/makefile.cpp
src/gui/util/qcompleter.cpp
src/network/access/qnetworkaccesshttpbackend_p.h