Merge branch '4.8-upstream' into master-water
authorWater-Team <water@pad.test.qt.nokia.com>
Thu, 24 Nov 2011 00:00:14 +0000 (01:00 +0100)
committerWater-Team <water@pad.test.qt.nokia.com>
Thu, 24 Nov 2011 00:00:14 +0000 (01:00 +0100)
commit366a6b941eecb9d5381d9513d591bdfcf5847425
tree0349c42faa6158c969c4dab3838014004dbd4ce1
parent3a9b8ff032b56b61b0e91213ca898793f0f31795
parent67b3edc50ad6e574f777d9accebe0750fbe3ddf7
Merge branch '4.8-upstream' into master-water
examples/declarative/shadereffects/main.cpp
examples/declarative/shadereffects/shadereffects.pro