summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.qmake.conf2
-rw-r--r--src/svg/qgraphicssvgitem.h6
-rw-r--r--src/svg/qsvggenerator.cpp3
-rw-r--r--src/svg/qsvgrenderer.h8
-rw-r--r--src/svg/qsvgwidget.h4
-rw-r--r--tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp6
6 files changed, 14 insertions, 15 deletions
diff --git a/.qmake.conf b/.qmake.conf
index 6fb07da..6cfd011 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -3,4 +3,4 @@ load(qt_build_config)
CONFIG += warning_clean
DEFINES += QT_NO_FOREACH
-MODULE_VERSION = 5.10.1
+MODULE_VERSION = 5.11.0
diff --git a/src/svg/qgraphicssvgitem.h b/src/svg/qgraphicssvgitem.h
index e849f7a..5102b91 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 = Q_NULLPTR);
- QGraphicsSvgItem(const QString &fileName, QGraphicsItem *parentItem = Q_NULLPTR);
+ QGraphicsSvgItem(QGraphicsItem *parentItem = nullptr);
+ QGraphicsSvgItem(const QString &fileName, QGraphicsItem *parentItem = nullptr);
void setSharedRenderer(QSvgRenderer *renderer);
QSvgRenderer *renderer() const;
@@ -80,7 +80,7 @@ public:
void paint(QPainter *painter,
const QStyleOptionGraphicsItem *option,
- QWidget *widget = Q_NULLPTR) override;
+ QWidget *widget = nullptr) override;
enum { Type = 13 };
int type() const override;
diff --git a/src/svg/qsvggenerator.cpp b/src/svg/qsvggenerator.cpp
index 8b9a9bd..424cc76 100644
--- a/src/svg/qsvggenerator.cpp
+++ b/src/svg/qsvggenerator.cpp
@@ -228,8 +228,7 @@ public:
QTextStream str(&d_func()->defs, QIODevice::Append);
str << "<mask id=\"" << maskId << "\" x=\"0\" y=\"0\" width=\"8\" height=\"8\" "
<< "stroke=\"none\" fill=\"#ffffff\" patternUnits=\"userSpaceOnUse\" >" << endl;
- const auto &rects = reg.rects();
- for (const QRect &r : rects)
+ for (QRect r : reg)
str << rct.arg(r.x()).arg(r.y()).arg(r.width()).arg(r.height()) << endl;
str << QStringLiteral("</mask>") << endl << endl;
d_func()->savedPatternMasks.append(maskId);
diff --git a/src/svg/qsvgrenderer.h b/src/svg/qsvgrenderer.h
index 6538df0..4413509 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 = 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(QObject *parent = nullptr);
+ QSvgRenderer(const QString &filename, QObject *parent = nullptr);
+ QSvgRenderer(const QByteArray &contents, QObject *parent = nullptr);
+ QSvgRenderer(QXmlStreamReader *contents, QObject *parent = nullptr);
~QSvgRenderer();
bool isValid() const;
diff --git a/src/svg/qsvgwidget.h b/src/svg/qsvgwidget.h
index 107c64d..8f6dd44 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 = Q_NULLPTR);
- QSvgWidget(const QString &file, QWidget *parent = Q_NULLPTR);
+ QSvgWidget(QWidget *parent = nullptr);
+ QSvgWidget(const QString &file, QWidget *parent = nullptr);
~QSvgWidget();
QSvgRenderer *renderer() const;
diff --git a/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp b/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp
index fd1b350..87d24c7 100644
--- a/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp
+++ b/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp
@@ -1235,7 +1235,7 @@ void tst_QSvgRenderer::testStopOffsetOpacity()
void tst_QSvgRenderer::testUseElement()
{
static const char *svgs[] = {
- //Use refering to non group node (1)
+ //Use referring to non group node (1)
"<svg viewBox = \"0 0 200 200\">"
" <polygon points=\"20,20 50,120 100,10 40,80 50,80\"/>"
" <polygon points=\"20,80 50,180 100,70 40,140 50,140\" fill= \"red\" stroke = \"blue\" fill-opacity = \"0.7\" fill-rule = \"evenodd\" stroke-width = \"3\"/>"
@@ -1256,7 +1256,7 @@ void tst_QSvgRenderer::testUseElement()
" <use y = \"60\" xlink:href = \"#usedPolyline\" fill = \" red\" stroke = \"blue\" fill-opacity = \"0.7\" fill-rule = \"evenodd\"/>"
" </g>"
"</svg>",
- //Use refering to non group node (2)
+ //Use referring to non group node (2)
"<svg viewBox = \"0 0 200 200\">"
" <polygon points=\"20,20 50,120 100,10 40,80 50,80\" fill = \"green\" fill-rule = \"nonzero\" stroke = \"purple\" stroke-width = \"4\" stroke-dasharray = \"1,1,3,1\" stroke-offset = \"3\" stroke-miterlimit = \"6\" stroke-linecap = \"butt\" stroke-linejoin = \"round\"/>"
" <polygon points=\"20,80 50,180 100,70 40,140 50,140\" fill= \"red\" stroke = \"blue\" fill-opacity = \"0.7\" fill-rule = \"evenodd\" stroke-width = \"3\" stroke-dasharray = \"1,1,1,1\" stroke-offset = \"5\" stroke-miterlimit = \"3\" stroke-linecap = \"butt\" stroke-linejoin = \"square\"/>"
@@ -1277,7 +1277,7 @@ void tst_QSvgRenderer::testUseElement()
" <use y = \"60\" xlink:href = \"#usedPolyline\" fill= \"red\" stroke = \"blue\" fill-opacity = \"0.7\" fill-rule = \"evenodd\" />"
" </g>"
"</svg>",
- //Use refering to group node
+ //Use referring to group node
"<svg viewBox = \"0 0 200 200\">"
" <g>"
" <circle cx=\"0\" cy=\"0\" r=\"100\" fill = \"red\" fill-opacity = \"0.6\"/>"
View Lorry Controller Status