Merge branch 'master' of git:qt/qt
authorThiago Macieira <thiago.macieira@nokia.com>
Sun, 21 Feb 2010 16:16:18 +0000 (17:16 +0100)
committerThiago Macieira <thiago.macieira@nokia.com>
Sun, 21 Feb 2010 16:16:18 +0000 (17:16 +0100)
commitfe1a44a850e61d8b64626424b45ef7592ec66589
tree5cceb6849ddebd37f3098664c52bdb629543cca1
parentef01812875f0dfc8e032fefb90f1afeb57aaa821
parent2181a341839b72a627a7ef641de58d1d2411f123
Merge branch 'master' of git:qt/qt

Conflicts:
doc/src/declarative/advtutorial1.qdoc
doc/src/declarative/advtutorial2.qdoc
doc/src/declarative/advtutorial3.qdoc
doc/src/declarative/advtutorial4.qdoc
doc/src/declarative/tutorial1.qdoc
doc/src/declarative/tutorial2.qdoc
doc/src/declarative/tutorial3.qdoc
doc/src/declarative/advtutorial.qdoc
doc/src/declarative/declarativeui.qdoc
doc/src/declarative/examples.qdoc
doc/src/declarative/qmlreference.qdoc
doc/src/declarative/tutorial.qdoc
src/gui/kernel/qeventdispatcher_mac.mm
src/testlib/qtestcase.cpp