diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 23:43:42 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 23:43:42 +0200 |
commit | ca030597815daad554450384e8fa87d3d256bbaf (patch) | |
tree | a9f22ddde8cbd5bb5b6f1a470ffdc76cff65f3a3 /src/svg | |
parent | 965cdb2f87e5d22950a7cd5434e2d80a2fbe6cf9 (diff) | |
parent | 612c3041475550837dee7149b9f5e9e4f55c17a0 (diff) | |
download | qtsvg-ca030597815daad554450384e8fa87d3d256bbaf.tar.gz |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I8226348c242d0d5bf1f78adc376ecbe26215445e
Diffstat (limited to 'src/svg')
-rw-r--r-- | src/svg/qgraphicssvgitem.h | 6 | ||||
-rw-r--r-- | src/svg/qsvggenerator.cpp | 2 | ||||
-rw-r--r-- | src/svg/qsvgrenderer.h | 8 | ||||
-rw-r--r-- | src/svg/qsvgwidget.h | 4 | ||||
-rw-r--r-- | src/svg/svg.pro | 3 |
5 files changed, 11 insertions, 12 deletions
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) |