Merge remote-tracking branch 'origin/5.4' into dev

Conflicts:
	src/quick/items/qquickpainteditem.h
	src/quick/items/qquickshadereffectsource.cpp
	src/quick/items/qquickshadereffectsource_p.h

Change-Id: If98096443afe85fc4370cef971eace050006a61b

1 files changed, 17 insertions, 25 deletions

diff --git a/src/quick/items/qquickspriteengine_p.h b/src/quick/items/qquickspriteengine_p.h
index 776cdaf39c..227041f181 100644
--- a/src/quick/items/qquickspriteengine_p.h
+++ b/src/quick/items/qquickspriteengine_p.h
@@ -1,40 +1,32 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtQuick module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL$
+** $QT_BEGIN_LICENSE:LGPL21$
 ** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
 ** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
+** rights. These rights are described in the Digia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -111,9 +103,9 @@ public:
 Q_SIGNALS:
     void durationChanged(int arg);
 
-    void nameChanged(QString arg);
+    void nameChanged(const QString &arg);
 
-    void toChanged(QVariantMap arg);
+    void toChanged(const QVariantMap &arg);
 
     void durationVariationChanged(int arg);
 
@@ -130,7 +122,7 @@ public Q_SLOTS:
         }
     }
 
-    void setName(QString arg)
+    void setName(const QString &arg)
     {
         if (m_name != arg) {
             m_name = arg;
@@ -138,7 +130,7 @@ public Q_SLOTS:
         }
     }
 
-    void setTo(QVariantMap arg)
+    void setTo(const QVariantMap &arg)
     {
         if (m_to != arg) {
             m_to = arg;
@@ -216,11 +208,11 @@ public:
 private:
 Q_SIGNALS:
 
-    void globalGoalChanged(QString arg);
+    void globalGoalChanged(const QString &arg);
     void stateChanged(int idx);
 
 public Q_SLOTS:
-    void setGlobalGoal(QString arg)
+    void setGlobalGoal(const QString &arg)
     {
         if (m_globalGoal != arg) {
             m_globalGoal = arg;