Merged master into qtquick2.
authoraxis <qt-info@nokia.com>
Wed, 27 Apr 2011 12:13:27 +0000 (14:13 +0200)
committeraxis <qt-info@nokia.com>
Wed, 27 Apr 2011 12:41:06 +0000 (14:41 +0200)
commit40b6a270a1f3b4c0bfb2d35cb96c4f929a7802ad
tree4b7f6d677530d690efc884dbd03a8c6518f5313d
parenta129444bb0156c936900dbd2f12bd9f427ff366c
parent10991179a60fae44b2446c408b16056db8b5d36d
Merged master into qtquick2.
src/declarative/declarative.pro
src/imports/particles/particles.pro