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

Change-Id: I8226348c242d0d5bf1f78adc376ecbe26215445e

7 files changed, 21 insertions, 22 deletions

diff --git a/src/plugins/iconengines/svgiconengine/svgiconengine.pro b/src/plugins/iconengines/svgiconengine/svgiconengine.pro
index 516142b..eb6847b 100644
--- a/src/plugins/iconengines/svgiconengine/svgiconengine.pro
+++ b/src/plugins/iconengines/svgiconengine/svgiconengine.pro
@@ -1,12 +1,12 @@
 TARGET  = qsvgicon
 
-PLUGIN_TYPE = iconengines
-PLUGIN_EXTENDS = svg
-PLUGIN_CLASS_NAME = QSvgIconPlugin
-load(qt_plugin)
-
 HEADERS += qsvgiconengine.h
 SOURCES += main.cpp \
            qsvgiconengine.cpp
 OTHER_FILES += qsvgiconengine.json
 QT += svg core-private gui-private
+
+PLUGIN_TYPE = iconengines
+PLUGIN_EXTENDS = svg
+PLUGIN_CLASS_NAME = QSvgIconPlugin
+load(qt_plugin)
diff --git a/src/plugins/imageformats/svg/svg.pro b/src/plugins/imageformats/svg/svg.pro
index ce1881f..9db6a9a 100644
--- a/src/plugins/imageformats/svg/svg.pro
+++ b/src/plugins/imageformats/svg/svg.pro
@@ -1,11 +1,11 @@
 TARGET  = qsvg
 
-PLUGIN_TYPE = imageformats
-PLUGIN_EXTENDS = svg
-PLUGIN_CLASS_NAME = QSvgPlugin
-load(qt_plugin)
-
 HEADERS += qsvgiohandler.h
 SOURCES += main.cpp \
            qsvgiohandler.cpp
 QT += svg
+
+PLUGIN_TYPE = imageformats
+PLUGIN_EXTENDS = svg
+PLUGIN_CLASS_NAME = QSvgPlugin
+load(qt_plugin)
diff --git a/src/svg/qgraphicssvgitem.h b/src/svg/qgraphicssvgitem.h
index 90ae4c5..88603ec 100644
--- a/src/svg/qgraphicssvgitem.h
+++ b/src/svg/qgraphicssvgitem.h
@@ -61,8 +61,8 @@ class Q_SVG_EXPORT QGraphicsSvgItem : public QGraphicsObject
     Q_PROPERTY(QSize maximumCacheSize READ maximumCacheSize WRITE setMaximumCacheSize)
 
 public:
-    QGraphicsSvgItem(QGraphicsItem *parentItem=0);
-    QGraphicsSvgItem(const QString &fileName, QGraphicsItem *parentItem=0);
+    QGraphicsSvgItem(QGraphicsItem *parentItem = Q_NULLPTR);
+    QGraphicsSvgItem(const QString &fileName, QGraphicsItem *parentItem = Q_NULLPTR);
 
     void setSharedRenderer(QSvgRenderer *renderer);
     QSvgRenderer *renderer() const;
@@ -80,7 +80,7 @@ public:
 
     virtual void paint(QPainter *painter,
                        const QStyleOptionGraphicsItem *option,
-                       QWidget *widget=0);
+                       QWidget *widget = Q_NULLPTR);
 
     enum { Type = 13 };
     virtual int type() const;
diff --git a/src/svg/qsvggenerator.cpp b/src/svg/qsvggenerator.cpp
index 46ebca4..468b97f 100644
--- a/src/svg/qsvggenerator.cpp
+++ b/src/svg/qsvggenerator.cpp
@@ -324,8 +324,6 @@ public:
 
     void qpenToSvg(const QPen &spen)
     {
-        QString width;
-
         d_func()->pen = spen;
 
         switch (spen.style()) {
diff --git a/src/svg/qsvgrenderer.h b/src/svg/qsvgrenderer.h
index fe58343..6538df0 100644
--- a/src/svg/qsvgrenderer.h
+++ b/src/svg/qsvgrenderer.h
@@ -65,10 +65,10 @@ class Q_SVG_EXPORT QSvgRenderer : public QObject
     Q_PROPERTY(int framesPerSecond READ framesPerSecond WRITE setFramesPerSecond)
     Q_PROPERTY(int currentFrame READ currentFrame WRITE setCurrentFrame)
 public:
-    QSvgRenderer(QObject *parent=0);
-    QSvgRenderer(const QString &filename, QObject *parent=0);
-    QSvgRenderer(const QByteArray &contents, QObject *parent=0);
-    QSvgRenderer(QXmlStreamReader *contents, QObject *parent=0);
+    QSvgRenderer(QObject *parent = Q_NULLPTR);
+    QSvgRenderer(const QString &filename, QObject *parent = Q_NULLPTR);
+    QSvgRenderer(const QByteArray &contents, QObject *parent = Q_NULLPTR);
+    QSvgRenderer(QXmlStreamReader *contents, QObject *parent = Q_NULLPTR);
     ~QSvgRenderer();
 
     bool isValid() const;
diff --git a/src/svg/qsvgwidget.h b/src/svg/qsvgwidget.h
index 3f5210e..d936c6b 100644
--- a/src/svg/qsvgwidget.h
+++ b/src/svg/qsvgwidget.h
@@ -59,8 +59,8 @@ class Q_SVG_EXPORT QSvgWidget : public QWidget
 {
     Q_OBJECT
 public:
-    QSvgWidget(QWidget *parent=0);
-    QSvgWidget(const QString &file, QWidget *parent=0);
+    QSvgWidget(QWidget *parent = Q_NULLPTR);
+    QSvgWidget(const QString &file, QWidget *parent = Q_NULLPTR);
     ~QSvgWidget();
 
     QSvgRenderer *renderer() const;
diff --git a/src/svg/svg.pro b/src/svg/svg.pro
index 8cee04f..ce5bf1a 100644
--- a/src/svg/svg.pro
+++ b/src/svg/svg.pro
@@ -7,7 +7,6 @@ win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000
 solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2
 
 QMAKE_DOCS = $$PWD/doc/qtsvg.qdocconf
-load(qt_module)
 
 HEADERS += \
     qsvggraphics_p.h        \
@@ -46,3 +45,5 @@ contains(QT_CONFIG, system-zlib) {
 } else {
     QT_PRIVATE += zlib-private
 }
+
+load(qt_module)