Merge branch 'master' of git://gitorious.org/qt/qtdeclarative into merge-master

author Matthew Vogt <matthew.vogt@nokia.com>

Tue, 13 Mar 2012 05:06:40 +0000 (15:06 +1000)

committer Matthew Vogt <matthew.vogt@nokia.com>

Tue, 13 Mar 2012 05:22:14 +0000 (15:22 +1000)
author Matthew Vogt <matthew.vogt@nokia.com>
Tue, 13 Mar 2012 05:06:40 +0000 (15:06 +1000)
committer Matthew Vogt <matthew.vogt@nokia.com>
Tue, 13 Mar 2012 05:22:14 +0000 (15:22 +1000)
diff --cc bin/rename-qtdeclarative-symbols.sh
Simple merge
diff --cc src/quick/items/qquickcanvas.cpp
Simple merge
diff --cc src/quick/items/qquickitem.cpp
Simple merge
author	Matthew Vogt <matthew.vogt@nokia.com>
	Tue, 13 Mar 2012 05:06:40 +0000 (15:06 +1000)
committer	Matthew Vogt <matthew.vogt@nokia.com>
	Tue, 13 Mar 2012 05:22:14 +0000 (15:22 +1000)
		1	2
bin/rename-qtdeclarative-symbols.sh	patch \|	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickcanvas.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickitem.cpp	patch \|	diff1 \|	diff2 \|	blob \| history