Merge remote branch 'origin/master' into 4.7

Conflicts:
	src/corelib/kernel/qmetatype.cpp
	src/declarative/graphicsitems/qdeclarativeevents.cpp
	src/declarative/graphicsitems/qdeclarativeflickable.cpp
	src/declarative/graphicsitems/qdeclarativegridview.cpp
	src/declarative/qml/qdeclarativescript.cpp
	src/declarative/util/qdeclarativeanimation.cpp
	src/declarative/util/qdeclarativebehavior.cpp
	src/declarative/util/qdeclarativeeasefollow.cpp
	src/declarative/util/qdeclarativefontloader.cpp
	src/declarative/util/qdeclarativelistmodel.cpp
	src/declarative/util/qdeclarativespringfollow.cpp
	src/declarative/util/qdeclarativestategroup.cpp
	src/declarative/util/qdeclarativesystempalette.cpp
	src/declarative/util/qdeclarativetimer.cpp
	src/declarative/util/qmlstateoperations.cpp
	src/multimedia/qml/qdeclarativeaudio.cpp
	src/multimedia/qml/qdeclarativevideo.cpp

1 files changed, 54 insertions, 0 deletions

diff --git a/tests/auto/declarative/visual/qdeclarativeparticles/particles.qml b/tests/auto/declarative/visual/qdeclarativeparticles/particles.qml
new file mode 100644
index 0000000..2d481c9
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativeparticles/particles.qml
@@ -0,0 +1,54 @@
+import Qt 4.6
+
+Rectangle {
+    width: 640; height: 480; color: "black"
+
+    Particles { id:particlesAnotEmitting
+        y:60; width: 260; height:30; source: "star.png";
+        lifeSpan:1000; count: 50; angle:70; angleDeviation:36;
+        velocity:30; velocityDeviation:10; emissionRate: 0
+        ParticleMotionWander { yvariance:5; xvariance:30; pace:100 }
+    }
+    Particles { id:particlesA
+        y:0; width: 260; height:30; source: "star.png";
+        lifeSpan:1000; count: 50; angle:70; angleDeviation:36;
+        velocity:30; velocityDeviation:10; emissionRate: 10
+        ParticleMotionWander { yvariance:5; xvariance:30; pace:100 }
+    }
+
+    Particles { id:particlesB
+        y:280; x:180; width:1; height:1; lifeSpan:1000; source: "star.png"
+        count: 100; angle:270; angleDeviation:45; velocity:50; velocityDeviation:30;
+        emissionRate: 0
+        ParticleMotionGravity { yattractor: 1000; xattractor:0; acceleration:25 }
+    }
+
+        Timer { running: true; interval: 1000; repeat: true; onTriggered: particlesB.burst(200, 2000); }
+
+    Column{
+        x: 340;
+        Repeater{
+            model: 5
+            delegate: Component{
+                Item{
+                    width: 100; height: 100
+                    Rectangle{
+                        color: "blue"
+                        width: 2; height: 2;
+                        x: 49; y:49;
+                    }
+                    Particles{
+                        x: 50; y:50; width: 0; height: 0;
+                        fadeInDuration: 0; fadeOutDuration: 0
+                        lifeSpan: 1000; lifeSpanDeviation:0;
+                        source: "star.png"
+                        count: -1; emissionRate: 120;
+                        emissionVariance: index/2;
+                        velocity: 250; velocityDeviation: 0;
+                        angle: 0; angleDeviation: 0;
+                    }
+                }
+            }
+        }
+    }
+}