Merge remote-tracking branch 'origin/5.14' into 5.15

Change-Id: Ib381f350ada365747ce20b989bfdc368d75f2219

4 files changed, 6 insertions, 6 deletions

diff --git a/src/particles/qquickcustomaffector.cpp b/src/particles/qquickcustomaffector.cpp
index cadd2992b1..5e2133dfaf 100644
--- a/src/particles/qquickcustomaffector.cpp
+++ b/src/particles/qquickcustomaffector.cpp
@@ -233,7 +233,7 @@ bool QQuickCustomAffector::affectParticle(QQuickParticleData *d, qreal dt)
     return changed;
 }
 
-void QQuickCustomAffector::affectProperties(const QList<QQuickParticleData*> particles, qreal dt)
+void QQuickCustomAffector::affectProperties(const QList<QQuickParticleData*> &particles, qreal dt)
 {
     foreach (QQuickParticleData* d, particles)
         if ( affectParticle(d, dt) )
diff --git a/src/particles/qquickcustomaffector_p.h b/src/particles/qquickcustomaffector_p.h
index 9fb7e67521..5e8671514d 100644
--- a/src/particles/qquickcustomaffector_p.h
+++ b/src/particles/qquickcustomaffector_p.h
@@ -158,7 +158,7 @@ protected:
     bool affectParticle(QQuickParticleData *d, qreal dt) override;
 
 private:
-    void affectProperties(const QList<QQuickParticleData*> particles, qreal dt);
+    void affectProperties(const QList<QQuickParticleData*> &particles, qreal dt);
     QQuickDirection * m_position;
     QQuickDirection * m_velocity;
     QQuickDirection * m_acceleration;
diff --git a/src/particles/qquickmaskextruder.cpp b/src/particles/qquickmaskextruder.cpp
index 4c5d9e9d88..2ce3650743 100644
--- a/src/particles/qquickmaskextruder.cpp
+++ b/src/particles/qquickmaskextruder.cpp
@@ -68,14 +68,14 @@ QQuickMaskExtruder::QQuickMaskExtruder(QObject *parent) :
 {
 }
 
-void QQuickMaskExtruder::setSource(QUrl arg)
+void QQuickMaskExtruder::setSource(const QUrl &arg)
 {
     if (m_source != arg) {
         m_source = arg;
 
         m_lastHeight = -1;//Trigger reset
         m_lastWidth = -1;
-        emit sourceChanged(arg);
+        emit sourceChanged(m_source);
         startMaskLoading();
     }
 }
diff --git a/src/particles/qquickmaskextruder_p.h b/src/particles/qquickmaskextruder_p.h
index 62c8c3f04b..419d162811 100644
--- a/src/particles/qquickmaskextruder_p.h
+++ b/src/particles/qquickmaskextruder_p.h
@@ -74,10 +74,10 @@ public:
 
 Q_SIGNALS:
 
-    void sourceChanged(QUrl arg);
+    void sourceChanged(const QUrl &arg);
 
 public Q_SLOTS:
-    void setSource(QUrl arg);
+    void setSource(const QUrl &arg);
 
 private Q_SLOTS:
     void startMaskLoading();