Merge branch 'master' into refactor

Conflicts:
	src/3rdparty/v8
	src/declarative/declarative.pro
	src/declarative/items/qsgcanvas.cpp
	src/declarative/items/qsgshadereffectsource_p.h
	src/declarative/items/qsgview.cpp
	src/declarative/particles/qsgcustomparticle.cpp
	src/imports/gestures/gestures.pro
	src/imports/particles/particles.pro
	src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro
	src/qtquick1/qtquick1.pro
	tests/auto/declarative/examples/examples.pro
	tests/auto/declarative/qsglistview/qsglistview.pro
	tests/auto/qtquick1/qdeclarativeviewer/qdeclarativeviewer.pro

Change-Id: I423344f83e1835116cad531b877fde6e68a8849a

1 files changed, 1 insertions, 28 deletions

diff --git a/examples/declarative/particles/custom/blurparticles.qml b/examples/declarative/particles/custom/blurparticles.qml
index 7974c6ab7c..238608c002 100644
--- a/examples/declarative/particles/custom/blurparticles.qml
+++ b/examples/declarative/particles/custom/blurparticles.qml
@@ -68,41 +68,14 @@ Rectangle{
 
     CustomParticle{
         system: sys 
-        //TODO: Someway that you don't have to rewrite the basics for a simple addition
         vertexShader:"
-            attribute highp vec2 vPos;
-            attribute highp vec2 vTex;
-            attribute highp vec4 vData; //  x = time,  y = lifeSpan, z = size,  w = endSize
-            attribute highp vec4 vVec; // x,y = constant speed,  z,w = acceleration
-            attribute highp float r;
-
-            uniform highp mat4 qt_Matrix;
-            uniform highp float timestamp;
             uniform lowp float qt_Opacity;
-
-            varying highp vec2 fTex;                                
             varying lowp float fFade;
             varying lowp float fBlur;
 
             void main() {                                           
-                fTex = vTex;                                        
-                highp float size = vData.z;
-                highp float endSize = vData.w;
-
+                defaultMain();
                 highp float t = (timestamp - vData.x) / vData.y;
-
-                highp float currentSize = mix(size, endSize, t * t);
-
-                if (t < 0. || t > 1.)
-                currentSize = 0.;
-
-                highp vec2 pos = vPos
-                - currentSize / 2. + currentSize * vTex          // adjust size
-                + vVec.xy * t * vData.y         // apply speed vector..
-                + 0.5 * vVec.zw * pow(t * vData.y, 2.);
-
-                gl_Position = qt_Matrix * vec4(pos.x, pos.y, 0, 1);
-
                 highp float fadeIn = min(t * 10., 1.);
                 highp float fadeOut = 1. - max(0., min((t - 0.75) * 4., 1.));