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

Change-Id: Ia593641e379c95100d29d3fac00afe024e6966c4

4 files changed, 4 insertions, 4 deletions

diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp
index fe79977..86ca77e 100644
--- a/src/svg/qsvghandler.cpp
+++ b/src/svg/qsvghandler.cpp
@@ -1986,7 +1986,7 @@ static void parseCSStoXMLAttrs(const QVector<QCss::Declaration> &declarations,
     }
 }
 
-void QSvgHandler::parseCSStoXMLAttrs(QString css, QVector<QSvgCssAttribute> *attributes)
+void QSvgHandler::parseCSStoXMLAttrs(const QString &css, QVector<QSvgCssAttribute> *attributes)
 {
     // preprocess (for unicode escapes), tokenize and remove comments
     m_cssParser.init(css);
diff --git a/src/svg/qsvghandler_p.h b/src/svg/qsvghandler_p.h
index 8eb061b..d76e56c 100644
--- a/src/svg/qsvghandler_p.h
+++ b/src/svg/qsvghandler_p.h
@@ -128,7 +128,7 @@ public:
     int animationDuration() const;
 
 #ifndef QT_NO_CSSPARSER
-    void parseCSStoXMLAttrs(QString css, QVector<QSvgCssAttribute> *attributes);
+    void parseCSStoXMLAttrs(const QString &css, QVector<QSvgCssAttribute> *attributes);
 #endif
 
     inline QPen defaultPen() const
diff --git a/src/svg/qsvgnode.cpp b/src/svg/qsvgnode.cpp
index 14aaea4..29fd4e5 100644
--- a/src/svg/qsvgnode.cpp
+++ b/src/svg/qsvgnode.cpp
@@ -341,7 +341,7 @@ QSvgNode::DisplayMode QSvgNode::displayMode() const
 
 qreal QSvgNode::strokeWidth(QPainter *p)
 {
-    QPen pen = p->pen();
+    const QPen &pen = p->pen();
     if (pen.style() == Qt::NoPen || pen.brush().style() == Qt::NoBrush || pen.isCosmetic())
         return 0;
     return pen.widthF();
diff --git a/src/svg/qsvgstyle.cpp b/src/svg/qsvgstyle.cpp
index b934f94..c4edd25 100644
--- a/src/svg/qsvgstyle.cpp
+++ b/src/svg/qsvgstyle.cpp
@@ -126,7 +126,7 @@ void QSvgFillStyle::setFillStyle(QSvgFillStyleProperty* style)
 
 void QSvgFillStyle::setBrush(QBrush brush)
 {
-    m_fill = brush;
+    m_fill = std::move(brush);
     m_style = 0;
     m_fillSet = 1;
 }