Merge branch 'dev' of ssh://codereview.qt-project.org/qt/qtdeclarative into wip/v4

Conflicts:
	src/imports/qtquick2/plugins.qmltypes
	src/qml/debugger/qv8debugservice.cpp
	src/qml/qml/qml.pri
	src/qml/qml/qqmlcompiler.cpp
	src/qml/qml/qqmlcomponent.cpp
	src/qml/qml/qqmlcontext.cpp
	src/qml/qml/qqmldata_p.h
	src/qml/qml/qqmlengine_p.h
	src/qml/qml/qqmljavascriptexpression.cpp
	src/qml/qml/qqmlxmlhttprequest.cpp
	src/qml/qml/v4/qv4bindings.cpp
	src/qml/qml/v4/qv4irbuilder.cpp
	src/qml/qml/v4/qv4jsonobject_p.h
	src/qml/qml/v8/qqmlbuiltinfunctions.cpp
	src/qml/qml/v8/qv8bindings.cpp
	src/qml/qml/v8/qv8contextwrapper.cpp
	src/qml/qml/v8/qv8listwrapper.cpp
	src/qml/qml/v8/qv8qobjectwrapper.cpp
	src/qml/qml/v8/qv8qobjectwrapper_p.h
	src/qml/qml/v8/qv8sequencewrapper_p_p.h
	src/qml/qml/v8/qv8typewrapper.cpp
	src/qml/qml/v8/qv8valuetypewrapper.cpp
	src/qml/types/qqmldelegatemodel.cpp
	src/quick/items/context2d/qquickcanvasitem.cpp
	src/quick/items/context2d/qquickcontext2d.cpp
	sync.profile
	tests/auto/qml/qjsengine/tst_qjsengine.cpp
	tests/benchmarks/qml/animation/animation.pro
	tools/qmlprofiler/qmlprofiler.pro

Change-Id: I18a76b8a81d87523247fa03a44ca334b1a2360c9

7 files changed, 11 insertions, 11 deletions

diff --git a/examples/quick/particles/emitters/content/burstandpulse.qml b/examples/quick/particles/emitters/content/burstandpulse.qml
index 18d1c43933..28c56b326d 100644
--- a/examples/quick/particles/emitters/content/burstandpulse.qml
+++ b/examples/quick/particles/emitters/content/burstandpulse.qml
@@ -67,7 +67,7 @@ Rectangle {
         id: particles
         anchors.fill: parent
         ImageParticle {
-            source: "../../images/star.png"
+            source: "qrc:///particleresources/star.png"
             alpha: 0
             colorVariation: 0.6
         }
diff --git a/examples/quick/particles/emitters/content/customemitter.qml b/examples/quick/particles/emitters/content/customemitter.qml
index 966c78e70f..9ad504ebc8 100644
--- a/examples/quick/particles/emitters/content/customemitter.qml
+++ b/examples/quick/particles/emitters/content/customemitter.qml
@@ -90,7 +90,7 @@ ParticleSystem {
     }
 
     ImageParticle {
-        source: "../../images/particle4.png"
+        source: "qrc:///particleresources/fuzzydot.png"
         alpha: 0.0
     }
 }
diff --git a/examples/quick/particles/emitters/content/emitmask.qml b/examples/quick/particles/emitters/content/emitmask.qml
index 08c04f6e5f..1c2e7b458f 100644
--- a/examples/quick/particles/emitters/content/emitmask.qml
+++ b/examples/quick/particles/emitters/content/emitmask.qml
@@ -51,7 +51,7 @@ Rectangle {
         anchors.centerIn: parent
 
         ImageParticle {
-            source: "../../images/particle.png"
+            source: "qrc:///particleresources/glowdot.png"
             z: 2
             anchors.fill: parent
             color: "#336666CC"
diff --git a/examples/quick/particles/emitters/content/maximumemitted.qml b/examples/quick/particles/emitters/content/maximumemitted.qml
index df92f05f4b..4bd9079770 100644
--- a/examples/quick/particles/emitters/content/maximumemitted.qml
+++ b/examples/quick/particles/emitters/content/maximumemitted.qml
@@ -53,7 +53,7 @@ Rectangle {
         ImageParticle {
             system: sys
             id: cp
-            source: "../../images/particle.png"
+            source: "qrc:///particleresources/glowdot.png"
             colorVariation: 0.4
             color: "#000000FF"
         }
diff --git a/examples/quick/particles/emitters/content/shapeanddirection.qml b/examples/quick/particles/emitters/content/shapeanddirection.qml
index 1dec5b2fa7..0ca433cfba 100644
--- a/examples/quick/particles/emitters/content/shapeanddirection.qml
+++ b/examples/quick/particles/emitters/content/shapeanddirection.qml
@@ -58,7 +58,7 @@ Rectangle {
         ImageParticle {
             groups: ["center","edge"]
             anchors.fill: parent
-            source: "../../images/particle.png"
+            source: "qrc:///particleresources/glowdot.png"
             colorVariation: 0.1
             color: "#009999FF"
         }
diff --git a/examples/quick/particles/emitters/content/trailemitter.qml b/examples/quick/particles/emitters/content/trailemitter.qml
index a4972b7b73..3186b511ef 100644
--- a/examples/quick/particles/emitters/content/trailemitter.qml
+++ b/examples/quick/particles/emitters/content/trailemitter.qml
@@ -56,7 +56,7 @@ Rectangle {
             system: particles
             anchors.fill: parent
             groups: ["A", "B"]
-            source: "../../images/particle.png"
+            source: "qrc:///particleresources/glowdot.png"
             colorVariation: 0
             color: "#00111111"
         }
@@ -65,7 +65,7 @@ Rectangle {
             anchors.fill: parent
             system: particles
             groups: ["C", "D"]
-            source: "../../images/particle.png"
+            source: "qrc:///particleresources/glowdot.png"
             colorVariation: 0.1
             color: "#00ff400f"
         }
diff --git a/examples/quick/particles/emitters/content/velocityfrommotion.qml b/examples/quick/particles/emitters/content/velocityfrommotion.qml
index 1f1d6607d0..d325f9b7e1 100644
--- a/examples/quick/particles/emitters/content/velocityfrommotion.qml
+++ b/examples/quick/particles/emitters/content/velocityfrommotion.qml
@@ -61,7 +61,7 @@ Rectangle {
     ParticleSystem { id: sys1 }
     ImageParticle {
         system: sys1
-        source: "../../images/particle.png"
+        source: "qrc:///particleresources/glowdot.png"
         color: "cyan"
         alpha: 0
         SequentialAnimation on color {
@@ -127,7 +127,7 @@ Rectangle {
             }
         }
         colorVariation: 0.5
-        source: "../../images/star.png"
+        source: "qrc:///particleresources/star.png"
     }
     Emitter {
         id: trailsStars
@@ -149,7 +149,7 @@ Rectangle {
     }
     ParticleSystem { id: sys3; }
     ImageParticle {
-        source: "../../images/particle.png"
+        source: "qrc:///particleresources/glowdot.png"
         system: sys3
         color: "orange"
         alpha: 0
@@ -191,7 +191,7 @@ Rectangle {
     ParticleSystem { id: sys4; }
     ImageParticle {
         system: sys4
-        source: "../../images/star.png"
+        source: "qrc:///particleresources/star.png"
         color: "green"
         alpha: 0
         SequentialAnimation on color {